@akinon/projectzero 1.98.0 → 1.99.0-rc.66

package/app-template/README.md

@@ -12,6 +12,30 @@ 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:
@@ -19,7 +43,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.98.0",
+  "version": "1.99.0-rc.66",
   "private": true,
   "license": "MIT",
   "scripts": {
@@ -24,22 +24,22 @@
     "test:middleware": "jest middleware-matcher.test.ts --bail"
   },
   "dependencies": {
-    "@akinon/next": "1.98.0",
-    "@akinon/pz-akifast": "1.98.0",
-    "@akinon/pz-b2b": "1.98.0",
-    "@akinon/pz-basket-gift-pack": "1.98.0",
-    "@akinon/pz-bkm": "1.98.0",
-    "@akinon/pz-checkout-gift-pack": "1.98.0",
-    "@akinon/pz-click-collect": "1.98.0",
-    "@akinon/pz-credit-payment": "1.98.0",
-    "@akinon/pz-gpay": "1.98.0",
-    "@akinon/pz-masterpass": "1.98.0",
-    "@akinon/pz-one-click-checkout": "1.98.0",
-    "@akinon/pz-otp": "1.98.0",
-    "@akinon/pz-pay-on-delivery": "1.98.0",
-    "@akinon/pz-saved-card": "1.98.0",
-    "@akinon/pz-tabby-extension": "1.98.0",
-    "@akinon/pz-tamara-extension": "1.98.0",
+    "@akinon/next": "1.99.0-rc.66",
+    "@akinon/pz-akifast": "1.99.0-rc.66",
+    "@akinon/pz-b2b": "1.99.0-rc.66",
+    "@akinon/pz-basket-gift-pack": "1.99.0-rc.66",
+    "@akinon/pz-bkm": "1.99.0-rc.66",
+    "@akinon/pz-checkout-gift-pack": "1.99.0-rc.66",
+    "@akinon/pz-click-collect": "1.99.0-rc.66",
+    "@akinon/pz-credit-payment": "1.99.0-rc.66",
+    "@akinon/pz-gpay": "1.99.0-rc.66",
+    "@akinon/pz-masterpass": "1.99.0-rc.66",
+    "@akinon/pz-one-click-checkout": "1.99.0-rc.66",
+    "@akinon/pz-otp": "1.99.0-rc.66",
+    "@akinon/pz-pay-on-delivery": "1.99.0-rc.66",
+    "@akinon/pz-saved-card": "1.99.0-rc.66",
+    "@akinon/pz-tabby-extension": "1.99.0-rc.66",
+    "@akinon/pz-tamara-extension": "1.99.0-rc.66",
     "@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.98.0",
+    "@akinon/eslint-plugin-projectzero": "1.99.0-rc.66",
     "@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.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/public/locales/en/common.json

@@ -27,7 +27,25 @@
     "clean": "clean",
     "categories": "CATEGORIES",
     "view_all": "VIEW ALL",
-    "not_found": "Search Results Not Found"
+    "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"
+    }
   },
   "page_404": {
     "title": "Page not found.",
@@ -71,5 +89,28 @@
   "file_input": {
     "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"
+    }
   }
 }

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

@@ -27,7 +27,25 @@
     "clean": "temizle",
     "categories": "KATEGORİLER",
     "view_all": "HEPSİNİ GÖSTER",
-    "not_found": "Arama Sonuçları Bulunamadı"
+    "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"
+    }
   },
   "page_404": {
     "title": "Sayfa bulunamadı.",
@@ -71,5 +89,28 @@
   "file_input": {
     "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ı"
+    }
   }
 }

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]/category/[pk]/page.tsx

@@ -2,12 +2,25 @@ import { getCategoryData } from '@akinon/next/data/server';
 import { withSegmentDefaults } from '@akinon/next/hocs/server';
 import { PageProps } from '@akinon/next/types';
 import CategoryLayout from '@theme/views/category/layout';
+import { notFound } from 'next/navigation';
 
 async function Page({ params, searchParams }: PageProps<{ pk: number }>) {
-  const { data, breadcrumbData } = await getCategoryData({
-    pk: params.pk,
-    searchParams
-  });
+  let categoryData;
+
+  try {
+    categoryData = await getCategoryData({
+      pk: params.pk,
+      searchParams
+    });
+  } catch (error) {
+    return notFound();
+  }
+
+  if (!categoryData || !categoryData.data) {
+    return notFound();
+  }
+
+  const { data, breadcrumbData } = categoryData;
 
   return (
     <>

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

@@ -1,9 +1,20 @@
 import { getFlatPageData } 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 }>) {
-  const data = await getFlatPageData({ pk: params.pk });
+  let data;
+
+  try {
+    data = await getFlatPageData({ pk: params.pk });
+  } catch (error) {
+    return notFound();
+  }
+
+  if (!data || !data.flat_page) {
+    return notFound();
+  }
 
   return (
     <div className="container mx-auto py-6">

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

@@ -4,6 +4,7 @@ import { getProductData, getWidgetData } from '@akinon/next/data/server';
 import { withSegmentDefaults } from '@akinon/next/hocs/server';
 import { PageProps, Metadata } from '@akinon/next/types';
 import { generateJsonLd } from '@theme/utils/generate-jsonld';
+import { notFound } from 'next/navigation';
 
 export async function generateMetadata({
   params,
@@ -12,14 +13,19 @@ export async function generateMetadata({
   let result: Metadata = {};
 
   try {
-    const {
-      data: { product }
-    } = await getProductData({
+    const productData = await getProductData({
       pk: params.pk,
       searchParams,
       groupProduct: true
     });
 
+    // If product data is not found, return empty metadata
+    if (!productData || !productData.data || !productData.data.product) {
+      return result;
+    }
+
+    const { product } = productData.data;
+
     result = {
       title: product.name,
       description: String(product.attributes.description),
@@ -42,15 +48,27 @@ export async function generateMetadata({
 }
 
 async function Page({ params, searchParams }: PageProps<{ pk: number }>) {
-  const [{ data, breadcrumbData }, deliveryReturn] = await Promise.all([
-    getProductData({
-      pk: params.pk,
-      searchParams,
-      groupProduct: true
-    }),
-    getWidgetData({ slug: 'product-delivery-returns' })
-  ]);
+  let productData;
+  let deliveryReturn;
+
+  try {
+    [productData, deliveryReturn] = await Promise.all([
+      getProductData({
+        pk: params.pk,
+        searchParams,
+        groupProduct: true
+      }),
+      getWidgetData({ slug: 'product-delivery-returns' })
+    ]);
+  } catch (error) {
+    return notFound();
+  }
+
+  if (!productData || !productData.data || !productData.data.product) {
+    return notFound();
+  }
 
+  const { data, breadcrumbData } = productData;
   const jsonLd = generateJsonLd(data.product);
 
   return (

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

@@ -1,9 +1,20 @@
 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 }>) {
-  const data = await getLandingPageData({ pk: params.pk });
+  let data;
+
+  try {
+    data = await getLandingPageData({ pk: params.pk });
+  } catch (error) {
+    return notFound();
+  }
+
+  if (!data || !data.landing_page) {
+    return notFound();
+  }
 
   const content = data.landing_page;
 

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/app/[commerce]/[locale]/[currency]/product/[pk]/page.tsx

@@ -4,6 +4,7 @@ import { PageProps, Metadata } from '@akinon/next/types';
 import { generateJsonLd } from '@theme/utils/generate-jsonld';
 import { AccordionWrapper, ProductInfo } from '@theme/views/product';
 import ProductLayout from '@theme/views/product/layout';
+import { notFound } from 'next/navigation';
 
 export async function generateMetadata({
   params,
@@ -12,13 +13,17 @@ export async function generateMetadata({
   let result: Metadata = {};
 
   try {
-    const {
-      data: { product }
-    } = await getProductData({
+    const productData = await getProductData({
       pk: params.pk,
       searchParams
     });
 
+    if (!productData || !productData.data || !productData.data.product) {
+      return result;
+    }
+
+    const { product } = productData.data;
+
     result = {
       title: product.name,
       description: String(product.attributes.description),
@@ -41,14 +46,27 @@ export async function generateMetadata({
 }
 
 async function Page({ params, searchParams }: PageProps<{ pk: number }>) {
-  const [{ data, breadcrumbData }, deliveryReturn] = await Promise.all([
-    getProductData({
-      pk: params.pk,
-      searchParams
-    }),
-    getWidgetData({ slug: 'product-delivery-returns' })
-  ]);
+  let productData;
+  let deliveryReturn;
+
+  try {
+    [productData, deliveryReturn] = await Promise.all([
+      getProductData({
+        pk: params.pk,
+        searchParams
+      }),
+      getWidgetData({ slug: 'product-delivery-returns' })
+    ]);
+  } catch (error) {
+    return notFound();
+  }
+
+  // If product data is not found, return 404
+  if (!productData || !productData.data || !productData.data.product) {
+    return notFound();
+  }
 
+  const { data, breadcrumbData } = productData;
   const jsonLd = generateJsonLd(data.product);
 
   return (

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

@@ -4,9 +4,20 @@ import { PageProps } from '@akinon/next/types';
 import CategoryLayout from '@theme/views/category/layout';
 import SpecialPageBanner from '@theme/widgets/special-page-banner';
 import SpecialPageCarousel from '@theme/widgets/special-page-carousel';
+import { notFound } from 'next/navigation';
 
 async function Page({ params, searchParams }: PageProps<{ pk: number }>) {
-  const data = await getSpecialPageData({ pk: params.pk, searchParams });
+  let data;
+
+  try {
+    data = await getSpecialPageData({ pk: params.pk, searchParams });
+  } catch (error) {
+    return notFound();
+  }
+
+  if (!data) {
+    return notFound();
+  }
 
   return (
     <>

package/app-template/src/app/api/image-proxy/route.ts

@@ -0,0 +1 @@
+export * from '@akinon/next/api/image-proxy';

package/app-template/src/app/api/similar-product-list/route.ts

@@ -0,0 +1 @@
+export * from '@akinon/next/api/similar-product-list';

package/app-template/src/app/api/similar-products/route.ts

@@ -0,0 +1 @@
+export * from '@akinon/next/api/similar-products';

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

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