@akinon/next 1.108.0-rc.87 → 1.108.0-rc.9

package/__tests__/next-config.test.ts

@@ -1,6 +1,15 @@
 import { resolve } from 'path';
 import type { NextConfig } from 'next';
-const findBaseDir = require('../utils/find-base-dir');
+
+function findBaseDir() {
+  const insideNodeModules = __dirname.includes('node_modules');
+
+  if (insideNodeModules) {
+    return resolve(__dirname, '../../../../');
+  } else {
+    return resolve(__dirname, '../../../apps/projectzeronext');
+  }
+}
 
 const baseDir = findBaseDir();
 

package/api/similar-product-list.ts

@@ -1,7 +1,5 @@
 import { NextRequest, NextResponse } from 'next/server';
-import { cookies } from 'next/headers';
 import Settings from 'settings';
-import { ServerVariables } from '../utils/server-variables';
 
 export async function GET(request: NextRequest) {
   try {
@@ -9,12 +7,6 @@ export async function GET(request: NextRequest) {
     const dynamicFilter = request.headers.get('x-search-dynamic-filter');
     const dynamicExclude = request.headers.get('x-search-dynamic-exclude');
 
-    const nextCookies = cookies();
-    const currency =
-      nextCookies.get('pz-currency')?.value || ServerVariables.currency;
-    const locale =
-      nextCookies.get('pz-locale')?.value || ServerVariables.locale;
-
     if (!dynamicFilter && !dynamicExclude) {
       return NextResponse.json(
         {
@@ -48,19 +40,6 @@ export async function GET(request: NextRequest) {
       headers['x-search-dynamic-exclude'] = dynamicExclude;
     }
 
-    if (currency) {
-      headers['x-currency'] = currency;
-    }
-
-    if (locale) {
-      const currentLocale = Settings.localization.locales.find(
-        (l) => l.value === locale
-      );
-      if (currentLocale) {
-        headers['Accept-Language'] = currentLocale.apiValue;
-      }
-    }
-
     const response = await fetch(apiUrl, {
       method: 'GET',
       headers

package/api/similar-products.ts

@@ -12,7 +12,6 @@ export async function GET(request: Request) {
   const limit = searchParams.get('limit') || '20';
   const url = searchParams.get('url');
   const excludedProductIds = searchParams.get('excluded_product_ids');
-  const text = searchParams.get('text');
 
   if (!url) {
     return errorResponse('URL parameter is required', 400);
@@ -30,10 +29,6 @@ export async function GET(request: Request) {
     apiParams.append('excluded_product_ids', excludedProductIds);
   }
 
-  if (text) {
-    apiParams.append('text', text);
-  }
-
   const apiUrl = `${IMAGE_SEARCH_API_URL}?${apiParams.toString()}`;
 
   try {
@@ -90,10 +85,6 @@ export async function POST(request: Request) {
     bodyData.excluded_product_ids = requestBody.excluded_product_ids;
   }
 
-  if (requestBody.text) {
-    bodyData.text = requestBody.text;
-  }
-
   try {
     const response = await fetch(apiUrl, {
       method: 'POST',

package/api/virtual-try-on.ts

@@ -0,0 +1,306 @@
+import { NextRequest, NextResponse } from 'next/server';
+import Settings from 'settings';
+
+const VIRTUAL_TRY_ON_API_URL = process.env.NEXT_PUBLIC_VIRTUAL_TRY_ON_API_URL;
+
+let limitedCategoriesCache: {
+  data: any;
+  timestamp: number;
+} | null = null;
+
+const CACHE_TTL = 3600000;
+
+function getClientIP(request: NextRequest): string | null {
+  const forwardedFor = request.headers.get('x-forwarded-for');
+  if (forwardedFor) {
+    const ip = forwardedFor.split(',')[0].trim();
+    if (ip === '::1' || ip === '::ffff:127.0.0.1') {
+      return '127.0.0.1';
+    }
+    return ip;
+  }
+
+  const realIP = request.headers.get('x-real-ip');
+  if (realIP) {
+    if (realIP === '::1' || realIP === '::ffff:127.0.0.1') {
+      return '127.0.0.1';
+    }
+    return realIP;
+  }
+
+  if (process.env.NODE_ENV === 'development') {
+    return '127.0.0.1';
+  }
+
+  return null;
+}
+
+function getLocaleFromRequest(request: NextRequest): string | null {
+  const cookieLocale = request.cookies.get('pz-locale')?.value;
+
+  if (cookieLocale) {
+    const currentLocale = Settings.localization.locales.find(
+      (l) => l.value === cookieLocale
+    );
+    return currentLocale?.apiValue || null;
+  }
+
+  return null;
+}
+
+export async function GET(request: NextRequest) {
+  try {
+    const { searchParams } = new URL(request.url);
+    const endpoint = searchParams.get('endpoint');
+
+    if (endpoint === 'limited-categories') {
+      const now = Date.now();
+
+      if (
+        limitedCategoriesCache &&
+        now - limitedCategoriesCache.timestamp < CACHE_TTL
+      ) {
+        return NextResponse.json(limitedCategoriesCache.data, {
+          status: 200,
+          headers: {
+            'Access-Control-Allow-Origin': '*',
+            'Access-Control-Allow-Methods': 'GET, POST, PUT, OPTIONS',
+            'Access-Control-Allow-Headers':
+              'Content-Type, Accept, Authorization',
+            'Cache-Control':
+              'public, s-maxage=3600, stale-while-revalidate=7200',
+            'X-Virtual-Try-On-Cache-Status': 'HIT'
+          }
+        });
+      }
+
+      const externalUrl = `${VIRTUAL_TRY_ON_API_URL}/api/v1/limited-categories`;
+      const clientIP = getClientIP(request);
+      const locale = getLocaleFromRequest(request);
+
+      const headersToSend = {
+        Accept: 'application/json',
+        ...(locale && { 'Accept-Language': locale }),
+        ...(request.headers.get('authorization') && {
+          Authorization: request.headers.get('authorization')!
+        }),
+        ...(clientIP && {
+          'X-Forwarded-For': clientIP
+        })
+      };
+
+      const response = await fetch(externalUrl, {
+        method: 'GET',
+        headers: headersToSend
+      });
+
+      let responseData: any;
+      const responseText = await response.text();
+
+      try {
+        responseData = responseText ? JSON.parse(responseText) : {};
+      } catch (parseError) {
+        responseData = { category_ids: [] };
+      }
+
+      if (!response.ok) {
+        responseData = { category_ids: [] };
+      }
+
+      limitedCategoriesCache = {
+        data: responseData,
+        timestamp: Date.now()
+      };
+
+      return NextResponse.json(responseData, {
+        status: response.ok ? response.status : 200,
+        headers: {
+          'Access-Control-Allow-Origin': '*',
+          'Access-Control-Allow-Methods': 'GET, POST, PUT, OPTIONS',
+          'Access-Control-Allow-Headers': 'Content-Type, Accept, Authorization',
+          'Cache-Control': 'public, s-maxage=3600, stale-while-revalidate=7200',
+          'X-Virtual-Try-On-Cache-Status': 'MISS'
+        }
+      });
+    }
+
+    return NextResponse.json(
+      { error: 'Invalid endpoint for GET method' },
+      { status: 400 }
+    );
+  } catch (error) {
+    return NextResponse.json({ category_ids: [] }, { status: 200 });
+  }
+}
+
+export async function POST(request: NextRequest) {
+  try {
+    const { searchParams } = new URL(request.url);
+    const endpoint = searchParams.get('endpoint');
+
+    const body = await request.json();
+
+    let externalUrl: string;
+    if (endpoint === 'feedback') {
+      externalUrl = `${VIRTUAL_TRY_ON_API_URL}/api/v1/feedback`;
+    } else {
+      externalUrl = `${VIRTUAL_TRY_ON_API_URL}/api/v1/virtual-try-on`;
+    }
+
+    const httpMethod = endpoint === 'feedback' ? 'PUT' : 'POST';
+    const clientIP = getClientIP(request);
+    const locale = getLocaleFromRequest(request);
+
+    const headersToSend = {
+      'Content-Type': 'application/json',
+      ...(locale && { 'Accept-Language': locale }),
+      ...(httpMethod === 'POST' && { Accept: 'application/json' }),
+      ...(request.headers.get('authorization') && {
+        Authorization: request.headers.get('authorization')!
+      }),
+      ...(clientIP && {
+        'X-Forwarded-For': clientIP
+      })
+    };
+
+    const response = await fetch(externalUrl, {
+      method: httpMethod,
+      headers: headersToSend,
+      body: JSON.stringify(body)
+    });
+
+    let responseData: any;
+    const responseText = await response.text();
+
+    if (endpoint === 'feedback') {
+      try {
+        responseData = responseText ? JSON.parse(responseText) : {};
+      } catch (parseError) {
+        responseData = { error: 'Invalid JSON response from feedback API' };
+      }
+    } else {
+      try {
+        responseData = responseText ? JSON.parse(responseText) : {};
+      } catch (parseError) {
+        responseData = { error: 'Invalid JSON response' };
+      }
+    }
+
+    if (!response.ok && responseData.error) {
+      let userFriendlyMessage = responseData.error;
+
+      if (
+        typeof responseData.error === 'string' &&
+        (responseData.error.includes('duplicate key value') ||
+          responseData.error.includes('image_pk'))
+      ) {
+        userFriendlyMessage =
+          'This image has already been processed. Please try with a different image.';
+      } else if (responseData.error.includes('bulk insert images')) {
+        userFriendlyMessage =
+          'There was an issue processing your image. Please try again with a different image.';
+      }
+
+      return NextResponse.json(
+        {
+          ...responseData,
+          message: userFriendlyMessage
+        },
+        {
+          status: response.status,
+          headers: {
+            'Access-Control-Allow-Origin': '*',
+            'Access-Control-Allow-Methods': 'POST, OPTIONS',
+            'Access-Control-Allow-Headers':
+              'Content-Type, Accept, Authorization'
+          }
+        }
+      );
+    }
+
+    return NextResponse.json(responseData, {
+      status: response.status,
+      headers: {
+        'Access-Control-Allow-Origin': '*',
+        'Access-Control-Allow-Methods': 'POST, OPTIONS',
+        'Access-Control-Allow-Headers': 'Content-Type, Accept, Authorization'
+      }
+    });
+  } catch (error) {
+    return NextResponse.json(
+      {
+        status: 'error',
+        message:
+          'Internal server error occurred during virtual try-on processing'
+      },
+      { status: 500 }
+    );
+  }
+}
+
+export async function PUT(request: NextRequest) {
+  try {
+    const { searchParams } = new URL(request.url);
+    const endpoint = searchParams.get('endpoint');
+
+    if (endpoint !== 'feedback') {
+      return NextResponse.json(
+        { error: 'PUT method only supports feedback endpoint' },
+        { status: 400 }
+      );
+    }
+
+    const body = await request.json();
+
+    const externalUrl = `${VIRTUAL_TRY_ON_API_URL}/api/v1/feedback`;
+    const clientIP = getClientIP(request);
+    const locale = getLocaleFromRequest(request);
+
+    const headersToSend = {
+      'Content-Type': 'application/json',
+      ...(locale && { 'Accept-Language': locale }),
+      ...(request.headers.get('authorization') && {
+        Authorization: request.headers.get('authorization')!
+      }),
+      ...(clientIP && {
+        'X-Forwarded-For': clientIP
+      })
+    };
+
+    const response = await fetch(externalUrl, {
+      method: 'PUT',
+      headers: headersToSend,
+      body: JSON.stringify(body)
+    });
+
+    const responseData = await response.json();
+
+    return NextResponse.json(responseData, {
+      status: response.status,
+      headers: {
+        'Access-Control-Allow-Origin': '*',
+        'Access-Control-Allow-Methods': 'GET, POST, PUT, OPTIONS',
+        'Access-Control-Allow-Headers': 'Content-Type, Accept, Authorization'
+      }
+    });
+  } catch (error) {
+    return NextResponse.json(
+      {
+        status: 'error',
+        message: 'Internal server error occurred during feedback submission'
+      },
+      { status: 500 }
+    );
+  }
+}
+
+export async function OPTIONS() {
+  return new NextResponse(null, {
+    status: 200,
+    headers: {
+      'Access-Control-Allow-Origin': '*',
+      'Access-Control-Allow-Methods': 'GET, POST, PUT, OPTIONS',
+      'Access-Control-Allow-Headers': 'Content-Type, Accept, Authorization'
+    }
+  });
+}

package/bin/pz-prebuild.js

@@ -2,7 +2,6 @@
 
 const runScript = require('./run-script');
 
-runScript('pz-run-tests.js');
 runScript('pz-install-theme.js');
 runScript('pz-pre-check-dist.js');
 runScript('pz-generate-translations.js');

package/components/input.tsx

@@ -1,8 +1,6 @@
 import clsx from 'clsx';
 import { forwardRef, FocusEvent, useState, Ref } from 'react';
 import { Controller } from 'react-hook-form';
-
-// @ts-ignore
 import { PatternFormat, PatternFormatProps } from 'react-number-format';
 import { InputProps } from '../types';
 import { twMerge } from 'tailwind-merge';

package/components/link.tsx

@@ -10,9 +10,7 @@ type LinkProps = Omit<
   React.AnchorHTMLAttributes<HTMLAnchorElement>,
   keyof NextLinkProps
 > &
-  NextLinkProps & {
-    href: string;
-  };
+  NextLinkProps;
 
 export const Link = ({ children, href, ...rest }: LinkProps) => {
   const { locale, defaultLocaleValue, localeUrlStrategy } = useLocalization();
@@ -28,21 +26,19 @@ export const Link = ({ children, href, ...rest }: LinkProps) => {
       return href;
     }
 
-    if (typeof href === 'string' && !href.startsWith('http')) {
-      const pathnameWithoutLocale = href.replace(urlLocaleMatcherRegex, '');
-      const hrefWithLocale = `/${locale}${pathnameWithoutLocale}`;
-
-      if (localeUrlStrategy === LocaleUrlStrategy.ShowAllLocales) {
-        return hrefWithLocale;
-      } else if (
-        localeUrlStrategy === LocaleUrlStrategy.HideDefaultLocale &&
-        locale !== defaultLocaleValue
-      ) {
-        return hrefWithLocale;
-      }
+    const pathnameWithoutLocale = href.replace(urlLocaleMatcherRegex, '');
+    const hrefWithLocale = `/${locale}${pathnameWithoutLocale}`;
+
+    if (localeUrlStrategy === LocaleUrlStrategy.ShowAllLocales) {
+      return hrefWithLocale;
+    } else if (
+      localeUrlStrategy === LocaleUrlStrategy.HideDefaultLocale &&
+      locale !== defaultLocaleValue
+    ) {
+      return hrefWithLocale;
     }
 
-    return href;
+    return href || '#';
   }, [href, defaultLocaleValue, locale, localeUrlStrategy]);
 
   return (

package/components/plugin-module.tsx

@@ -21,8 +21,10 @@ enum Plugin {
   Akifast = 'pz-akifast',
   MultiBasket = 'pz-multi-basket',
   SavedCard = 'pz-saved-card',
+  FlowPayment = 'pz-flow-payment',
+  VirtualTryOn = 'pz-virtual-try-on',
   Hepsipay = 'pz-hepsipay',
-  FlowPayment = 'pz-flow-payment'
+  SimilarProducts = 'pz-similar-products'
 }
 
 export enum Component {
@@ -48,6 +50,14 @@ export enum Component {
   AkifastCheckoutButton = 'CheckoutButton',
   MultiBasket = 'MultiBasket',
   SavedCard = 'SavedCardOption',
+  VirtualTryOnPlugin = 'VirtualTryOnPlugin',
+  SimilarProductsModal = 'SimilarProductsModal',
+  SimilarProductsFilterSidebar = 'SimilarProductsFilterSidebar',
+  SimilarProductsResultsGrid = 'SimilarProductsResultsGrid',
+  SimilarProductsPlugin = 'SimilarProductsPlugin',
+  ProductImageSearchFeature = 'ProductImageSearchFeature',
+  ImageSearchButton = 'ImageSearchButton',
+  HeaderImageSearchFeature = 'HeaderImageSearchFeature',
   IyzicoSavedCard = 'IyzicoSavedCardOption',
   Hepsipay = 'Hepsipay',
   FlowPayment = 'FlowPayment'
@@ -83,10 +93,24 @@ const PluginComponents = new Map([
     [Component.AkifastQuickLoginButton, Component.AkifastCheckoutButton]
   ],
   [Plugin.MultiBasket, [Component.MultiBasket]],
+  [Plugin.SavedCard, [Component.SavedCard]],
+  [
+    Plugin.SimilarProducts,
+    [
+      Component.SimilarProductsModal,
+      Component.SimilarProductsFilterSidebar,
+      Component.SimilarProductsResultsGrid,
+      Component.SimilarProductsPlugin,
+      Component.ProductImageSearchFeature,
+      Component.ImageSearchButton,
+      Component.HeaderImageSearchFeature
+    ]
+  ],
   [Plugin.SavedCard, [Component.SavedCard, Component.IyzicoSavedCard]],
   [Plugin.SavedCard, [Component.SavedCard]],
-  [Plugin.Hepsipay, [Component.Hepsipay]],
-  [Plugin.FlowPayment, [Component.FlowPayment]]
+  [Plugin.FlowPayment, [Component.FlowPayment]],
+  [Plugin.VirtualTryOn, [Component.VirtualTryOnPlugin]],
+  [Plugin.Hepsipay, [Component.Hepsipay]]
 ]);
 
 const getPlugin = (component: Component) => {
@@ -151,10 +175,14 @@ export default function PluginModule({
               promise = import(`${'@akinon/pz-multi-basket'}`);
             } else if (plugin === Plugin.SavedCard) {
               promise = import(`${'@akinon/pz-saved-card'}`);
+            } else if (plugin === Plugin.SimilarProducts) {
+              promise = import(`${'@akinon/pz-similar-products'}`);
             } else if (plugin === Plugin.Hepsipay) {
               promise = import(`${'@akinon/pz-hepsipay'}`);
             } else if (plugin === Plugin.FlowPayment) {
               promise = import(`${'@akinon/pz-flow-payment'}`);
+            } else if (plugin === Plugin.VirtualTryOn) {
+              promise = import(`${'@akinon/pz-virtual-try-on'}`);
             }
           } catch (error) {
             logger.error(error);

package/data/client/checkout.ts

@@ -35,10 +35,8 @@ import {
 
 interface CheckoutResponse {
   pre_order?: PreOrder;
-  errors?: {
-    non_field_errors?: string;
-    sample_products?: string[];
-    [key: string]: string | string[] | undefined;
+  errors: {
+    non_field_errors: string;
   };
   context_list?: CheckoutContext[];
   template_name?: string;
@@ -499,12 +497,22 @@ export const checkoutApi = api.injectEndpoints({
         dispatch(setPaymentStepBusy(false));
       }
     }),
-    setWalletCompletePage: build.mutation<CheckoutResponse, boolean>({
-      query: (success: boolean) => ({
-        url: buildClientRequestUrl(checkout.setWalletCompletePage),
+    setWalletCompletePage: build.mutation<
+      CheckoutResponse,
+      {
+        success: boolean;
+        cko_payment_id?: string;
+        [key: string]: any;
+      }
+    >({
+      query: ({ success, ...additionalParams }) => ({
+        url: buildClientRequestUrl(checkout.setWalletCompletePage, {
+          useFormData: true
+        }),
         method: 'POST',
         body: {
-          success
+          success,
+          ...additionalParams
         }
       }),
       async onQueryStarted(arg, { dispatch, queryFulfilled }) {

package/data/server/category.ts

@@ -5,6 +5,7 @@ import { category, product } from '../urls';
 import { Cache, CacheKey } from '../../lib/cache';
 import { parse } from 'lossless-json';
 import logger from '../../utils/log';
+import { headers as nHeaders } from 'next/headers';
 import { ServerVariables } from '../../utils/server-variables';
 
 function getCategoryDataHandler(
@@ -17,30 +18,19 @@ function getCategoryDataHandler(
   return async function () {
     const params = generateCommerceSearchParams(searchParams);
 
-    let rawData: string;
-
-    try {
-      rawData = await appFetch<string>({
-        url: `${category.getCategoryByPk(pk)}${params ? params : ''}`,
-        locale,
-        currency,
-        init: {
-          headers: {
-            Accept: 'application/json',
-            'Content-Type': 'application/json',
-            ...(headers ?? {})
-          }
-        },
-        responseType: FetchResponseType.TEXT
-      });
-    } catch (error) {
-      logger.error('Failed to fetch category data', {
-        handler: 'getCategoryDataHandler',
-        pk,
-        error: error.message
-      });
-      return null;
-    }
+    const rawData = await appFetch<string>({
+      url: `${category.getCategoryByPk(pk)}${params ? params : ''}`,
+      locale,
+      currency,
+      init: {
+        headers: {
+          Accept: 'application/json',
+          'Content-Type': 'application/json',
+          ...(headers ?? {})
+        }
+      },
+      responseType: FetchResponseType.TEXT
+    });
 
     let data: GetCategoryResponse;
 
@@ -74,27 +64,17 @@ function getCategoryDataHandler(
       return { data, breadcrumbData: undefined };
     }
 
-    let breadcrumbData: { menu?: unknown } = {};
-
-    try {
-      breadcrumbData = await appFetch<{ menu?: unknown }>({
-        url: product.breadcrumbUrl(menuItemModel),
-        locale,
-        currency,
-        init: {
-          headers: {
-            Accept: 'application/json',
-            'Content-Type': 'application/json'
-          }
+    const breadcrumbData = await appFetch<any>({
+      url: product.breadcrumbUrl(menuItemModel),
+      locale,
+      currency,
+      init: {
+        headers: {
+          Accept: 'application/json',
+          'Content-Type': 'application/json'
         }
-      });
-    } catch (error) {
-      logger.warn('Failed to fetch breadcrumb data', {
-        handler: 'getCategoryDataHandler',
-        pk,
-        error: error.message
-      });
-    }
+      }
+    });
 
     return { data, breadcrumbData: breadcrumbData?.menu };
   };

package/data/server/flatpage.ts

@@ -11,24 +11,20 @@ const getFlatPageDataHandler = (
   headers?: Record<string, string>
 ) => {
   return async function () {
-    try {
-      const data = await appFetch<FlatPage>({
-        url: flatpage.getFlatPageByPk(pk),
-        locale,
-        currency,
-        init: {
-          headers: {
-            Accept: 'application/json',
-            'Content-Type': 'application/json',
-            ...(headers ?? {})
-          }
+    const data = await appFetch<FlatPage>({
+      url: flatpage.getFlatPageByPk(pk),
+      locale,
+      currency,
+      init: {
+        headers: {
+          Accept: 'application/json',
+          'Content-Type': 'application/json',
+          ...(headers ?? {})
         }
-      });
+      }
+    });
 
-      return data;
-    } catch (error) {
-      return null;
-    }
+    return data;
   };
 };