@akinon/projectzero 1.105.0-rc.84 → 1.105.0

package/app-template/src/views/product/slider.tsx

@@ -7,7 +7,6 @@ import { Product } from '@akinon/next/types';
 import { Image } from '@akinon/next/components/image';
 import useFavButton from '../../hooks/use-fav-button';
 import { twMerge } from 'tailwind-merge';
-import PluginModule, { Component } from '@akinon/next/components/plugin-module';
 
 type ProductSliderItem = {
   product: Product;
@@ -36,102 +35,90 @@ export default function ProductInfoSlider({ product }: ProductSliderItem) {
     carouselRef.current?.next();
   };
 
-  const handleThumbnailClick = (index: number) => {
+  const handleThumbnailClick = (index) => {
     setActiveIndex(index);
     carouselRef.current?.goToSlide(index);
   };
 
   return (
-    <>
-      <div className="lg:grid lg:grid-cols-6">
-        <div className="lg:col-span-1">
-          <div className="flex flex-col items-center justify-center md:mr-[6px]">
-            <button
-              onClick={goToPrev}
-              className={twMerge(
-                'hidden justify-center p-2 mb-3 border border-gray-100 rounded-full cursor-pointer lg:block',
-                [activeIndex === 0 && 'cursor-not-allowed opacity-45']
-              )}
-              disabled={activeIndex === 0}
-            >
-              <Icon name="chevron-up" size={15} className="fill-[#000000]" />
-            </button>
-            <div className="hidden flex-col items-center overflow-scroll w-[80px] max-h-[620px] lg:block">
-              {product?.productimage_set?.map((item, index) => (
-                <Image
-                  key={index}
-                  src={item.image}
-                  alt={`Thumbnail ${index}`}
-                  width={80}
-                  height={128}
-                  aspectRatio={80 / 128}
-                  className={twMerge('cursor-pointer', [
-                    activeIndex === index && 'border-2 border-primary'
-                  ])}
-                  onClick={() => handleThumbnailClick(index)}
-                />
-              ))}
-            </div>
-            <button
-              onClick={goToNext}
-              className={twMerge(
-                'hidden justify-center p-2 mt-3 border border-gray-100 rounded-full cursor-pointer lg:block',
-                [
-                  activeIndex === product.productimage_set.length - 1 &&
-                    'cursor-not-allowed opacity-45'
-                ]
-              )}
-              disabled={activeIndex === product.productimage_set.length - 1}
-            >
-              <Icon name="chevron-down" size={15} className="fill-[#000000]" />
-            </button>
-          </div>
-        </div>
-
-        <div className="relative lg:col-span-5">
-          <FavButton className="absolute right-8 top-6 z-[20] sm:hidden" />
-
-          <PluginModule
-            component={Component.ProductImageSearchFeature}
-            props={{
-              product,
-              activeIndex,
-              showResetButton: true
-            }}
-          />
-
-          <CarouselCore
-            responsive={{
-              all: {
-                breakpoint: { max: 5000, min: 0 },
-                items: 1
-              }
-            }}
-            arrows={false}
-            swipeable={true}
-            ref={carouselRef}
-            afterChange={(previousSlide, { currentSlide }) => {
-              setActiveIndex(currentSlide);
-            }}
-            containerAspectRatio={{ mobile: 520 / 798, desktop: 484 / 726 }}
+    <div className="lg:grid lg:grid-cols-6">
+      <div className="lg:col-span-1">
+        <div className="flex flex-col items-center justify-center md:mr-[6px]">
+          <button
+            onClick={goToPrev}
+            className={twMerge(
+              'hidden justify-center p-2 mb-3 border border-gray-100 rounded-full cursor-pointer lg:block',
+              [activeIndex === 0 && 'cursor-not-allowed opacity-45']
+            )}
+            disabled={activeIndex === 0}
           >
-            {product?.productimage_set?.map((item, i) => (
+            <Icon name="chevron-up" size={15} className="fill-[#000000]" />
+          </button>
+          <div className="hidden flex-col items-center overflow-scroll w-[80px] max-h-[620px] lg:block">
+            {product?.productimage_set?.map((item, index) => (
               <Image
-                key={i}
+                key={index}
                 src={item.image}
-                alt={product?.name || 'Product image'}
-                draggable={false}
-                aspectRatio={484 / 726}
-                sizes="(min-width: 425px) 512px,
-              (min-width: 601px) 576px,
-              (min-width: 768px) 336px,
-              (min-width: 1024px) 484px, 368px"
-                fill
+                alt={`Thumbnail ${index}`}
+                width={80}
+                height={128}
+                className={twMerge('cursor-pointer', [
+                  activeIndex === index && 'border-2 border-primary'
+                ])}
+                onClick={() => handleThumbnailClick(index)}
               />
             ))}
-          </CarouselCore>
+          </div>
+          <button
+            onClick={goToNext}
+            className={twMerge(
+              'hidden justify-center p-2 mt-3 border border-gray-100 rounded-full cursor-pointer lg:block',
+              [
+                activeIndex === product.productimage_set.length - 1 &&
+                  'cursor-not-allowed opacity-45'
+              ]
+            )}
+            disabled={activeIndex === product.productimage_set.length - 1}
+          >
+            <Icon name="chevron-down" size={15} className="fill-[#000000]" />
+          </button>
         </div>
       </div>
-    </>
+
+      <div className="relative lg:col-span-5">
+        <FavButton className="absolute right-8 top-6 z-[20] sm:hidden" />
+
+        <CarouselCore
+          responsive={{
+            all: {
+              breakpoint: { max: 5000, min: 0 },
+              items: 1
+            }
+          }}
+          arrows={false}
+          swipeable={true}
+          ref={carouselRef}
+          afterChange={(previousSlide, { currentSlide }) => {
+            setActiveIndex(currentSlide);
+          }}
+          containerAspectRatio={{ mobile: 520 / 798, desktop: 484 / 726 }}
+        >
+          {product?.productimage_set?.map((item, i) => (
+            <Image
+              key={i}
+              src={item.image}
+              alt={product.name}
+              draggable={false}
+              aspectRatio={484 / 726}
+              sizes="(min-width: 425px) 512px,
+            (min-width: 601px) 576px,
+            (min-width: 768px) 336px,
+            (min-width: 1024px) 484px, 368px"
+              fill
+            />
+          ))}
+        </CarouselCore>
+      </div>
+    </div>
   );
 }

package/commands/plugins.ts

@@ -29,14 +29,7 @@ async function checkVersion(pkg: PackageJson) {
 
     if (!semver.satisfies(pkg.dependencies['@akinon/next'], latestVersion)) {
       console.warn(
-        `\x1b[43m Warning: The "${packageName}" package is currently at`,
-        `\x1b[41m version ${pkg.dependencies['@akinon/next']}`,
-        `\x1b[43m Please upgrade it to the latest version (${latestVersion}) to ensure plugin compatibility.`,
-        '\x1b[0m\n'
-      );
-    } else {
-      console.log(
-        `\x1b[42m Info: The package "${packageName}" is currently in the current version (${latestVersion}).`,
+        `\x1b[43mWarning: The "${packageName}" package is currently at version ${pkg.dependencies['@akinon/next']}. Please upgrade it to the latest version (${latestVersion}) to ensure plugin compatibility.`,
         '\x1b[0m\n'
       );
     }
@@ -61,27 +54,7 @@ export default async () => {
     }
   }
 
-  function findPackageJson(): PackageJson {
-    const packageJsonPaths = [
-      path.resolve(rootDir, './package.json'),
-      path.resolve(rootDir, './apps/projectzeronext/package.json')
-    ];
-
-    for (const packageJsonPath of packageJsonPaths) {
-      try {
-        const pkg = require(packageJsonPath);
-        if (pkg.dependencies['@akinon/next']) {
-          return pkg;
-        }
-      } catch (error) {
-        continue;
-      }
-    }
-
-    throw new Error('Could not find package.json with @akinon/next dependency');
-  }
-
-  const pkg = findPackageJson();
+  const pkg: PackageJson = require(path.resolve(rootDir, './package.json'));
   await checkVersion(pkg);
 
   const pluginsFilePath = findPluginsFilePath();
@@ -96,65 +69,45 @@ export default async () => {
   }
 
   const definedPlugins = [
-    {
-      name: 'Akifast',
-      value: 'pz-akifast'
-    },
-    {
-      name: 'Apple Pay',
-      value: 'pz-apple-pay'
-    },
-    {
-      name: 'B2B',
-      value: 'pz-b2b'
-    },
     {
       name: 'Basket Gift Pack',
       value: 'pz-basket-gift-pack'
     },
     {
-      name: 'BKM Express',
-      value: 'pz-bkm'
+      name: 'Click & Collect',
+      value: 'pz-click-collect'
     },
     {
       name: 'Checkout Gift Pack',
       value: 'pz-checkout-gift-pack'
     },
     {
-      name: 'Click & Collect',
-      value: 'pz-click-collect'
-    },
-    {
-      name: 'Credit Payment',
-      value: 'pz-credit-payment'
+      name: 'One Click Checkout',
+      value: 'pz-one-click-checkout'
     },
     {
       name: 'Garanti Pay',
       value: 'pz-gpay'
     },
     {
-      name: 'Masterpass',
-      value: 'pz-masterpass'
-    },
-    {
-      name: 'Multi Basket',
-      value: 'pz-multi-basket'
-    },
-    {
-      name: 'One Click Checkout',
-      value: 'pz-one-click-checkout'
+      name: 'Pay On Delivery',
+      value: 'pz-pay-on-delivery'
     },
     {
       name: 'Otp',
       value: 'pz-otp'
     },
     {
-      name: 'Pay On Delivery',
-      value: 'pz-pay-on-delivery'
+      name: 'BKM Express',
+      value: 'pz-bkm'
     },
     {
-      name: 'Saved Card',
-      value: 'pz-saved-card'
+      name: 'Credit Payment',
+      value: 'pz-credit-payment'
+    },
+    {
+      name: 'Multi Basket',
+      value: 'pz-multi-basket'
     },
     {
       name: 'Tabby Payment Extension',

package/dist/commands/plugins.js

@@ -50,10 +50,7 @@ function checkVersion(pkg) {
             const pkgInfo = (yield response.json());
             const latestVersion = pkgInfo['dist-tags'].latest;
             if (!semver_1.default.satisfies(pkg.dependencies['@akinon/next'], latestVersion)) {
-                console.warn(`\x1b[43m Warning: The "${packageName}" package is currently at`, `\x1b[41m version ${pkg.dependencies['@akinon/next']}`, `\x1b[43m Please upgrade it to the latest version (${latestVersion}) to ensure plugin compatibility.`, '\x1b[0m\n');
-            }
-            else {
-                console.log(`\x1b[42m Info: The package "${packageName}" is currently in the current version (${latestVersion}).`, '\x1b[0m\n');
+                console.warn(`\x1b[43mWarning: The "${packageName}" package is currently at version ${pkg.dependencies['@akinon/next']}. Please upgrade it to the latest version (${latestVersion}) to ensure plugin compatibility.`, '\x1b[0m\n');
             }
         }
         catch (error) {
@@ -75,25 +72,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
             throw new Error('plugins.js was not found in either of the expected locations.');
         }
     }
-    function findPackageJson() {
-        const packageJsonPaths = [
-            path_1.default.resolve(rootDir, './package.json'),
-            path_1.default.resolve(rootDir, './apps/projectzeronext/package.json')
-        ];
-        for (const packageJsonPath of packageJsonPaths) {
-            try {
-                const pkg = require(packageJsonPath);
-                if (pkg.dependencies['@akinon/next']) {
-                    return pkg;
-                }
-            }
-            catch (error) {
-                continue;
-            }
-        }
-        throw new Error('Could not find package.json with @akinon/next dependency');
-    }
-    const pkg = findPackageJson();
+    const pkg = require(path_1.default.resolve(rootDir, './package.json'));
     yield checkVersion(pkg);
     const pluginsFilePath = findPluginsFilePath();
     let installedPlugins = [];
@@ -105,65 +84,45 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         process.exit(1);
     }
     const definedPlugins = [
-        {
-            name: 'Akifast',
-            value: 'pz-akifast'
-        },
-        {
-            name: 'Apple Pay',
-            value: 'pz-apple-pay'
-        },
-        {
-            name: 'B2B',
-            value: 'pz-b2b'
-        },
         {
             name: 'Basket Gift Pack',
             value: 'pz-basket-gift-pack'
         },
         {
-            name: 'BKM Express',
-            value: 'pz-bkm'
+            name: 'Click & Collect',
+            value: 'pz-click-collect'
         },
         {
             name: 'Checkout Gift Pack',
             value: 'pz-checkout-gift-pack'
         },
         {
-            name: 'Click & Collect',
-            value: 'pz-click-collect'
-        },
-        {
-            name: 'Credit Payment',
-            value: 'pz-credit-payment'
+            name: 'One Click Checkout',
+            value: 'pz-one-click-checkout'
         },
         {
             name: 'Garanti Pay',
             value: 'pz-gpay'
         },
         {
-            name: 'Masterpass',
-            value: 'pz-masterpass'
-        },
-        {
-            name: 'Multi Basket',
-            value: 'pz-multi-basket'
-        },
-        {
-            name: 'One Click Checkout',
-            value: 'pz-one-click-checkout'
+            name: 'Pay On Delivery',
+            value: 'pz-pay-on-delivery'
         },
         {
             name: 'Otp',
             value: 'pz-otp'
         },
         {
-            name: 'Pay On Delivery',
-            value: 'pz-pay-on-delivery'
+            name: 'BKM Express',
+            value: 'pz-bkm'
+        },
+        {
+            name: 'Credit Payment',
+            value: 'pz-credit-payment'
         },
         {
-            name: 'Saved Card',
-            value: 'pz-saved-card'
+            name: 'Multi Basket',
+            value: 'pz-multi-basket'
         },
         {
             name: 'Tabby Payment Extension',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akinon/projectzero",
-  "version": "1.105.0-rc.84",
+  "version": "1.105.0",
   "private": false,
   "description": "CLI tool to manage your Project Zero Next project",
   "bin": {

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

@@ -1,67 +0,0 @@
-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/api/image-proxy/route.ts

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

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

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

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

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

package/app-template/src/hooks/use-product-cart.ts

@@ -1,77 +0,0 @@
-import { useState } from 'react';
-import { useAddProductToBasket } from './index';
-import { pushAddToCart } from '@theme/utils/gtm';
-import { validateVariantSelection } from '../utils/variant-validation';
-import { VariantType } from '@akinon/next/types';
-
-interface Product {
-  pk: number;
-  [key: string]: any;
-}
-
-interface UseProductCartProps {
-  product: Product;
-  variants: VariantType[];
-}
-
-interface AddToCartError {
-  data?: {
-    non_field_errors?: string[];
-    [key: string]: string[];
-  };
-}
-
-export const useProductCart = ({ product, variants }: UseProductCartProps) => {
-  const [productError, setProductError] = useState<React.ReactNode | null>(null);
-  const [addProduct, { isLoading: isAddToCartLoading }] = useAddProductToBasket();
-
-  const formatError = (error: AddToCartError) => {
-    if (error?.data?.non_field_errors) {
-      return error.data.non_field_errors;
-    }
-    
-    if (error?.data) {
-      return Object.keys(error.data).map(
-        (key) => `${key}: ${error.data[key].join(', ')}`
-      );
-    }
-    
-    return 'An error occurred';
-  };
-
-  const addProductToCart = async () => {
-    const validation = validateVariantSelection(variants);
-    
-    if (!validation.isValid) {
-      setProductError(validation.errorMessage);
-      return false;
-    }
-
-    try {
-      await addProduct({
-        product: product.pk,
-        quantity: 1,
-        attributes: {}
-      });
-
-      pushAddToCart(product);
-      setProductError(null);
-      return true;
-    } catch (error) {
-      const formattedError = formatError(error as AddToCartError);
-      setProductError(formattedError);
-      return false;
-    }
-  };
-
-  const clearProductError = () => {
-    setProductError(null);
-  };
-
-  return {
-    addProductToCart,
-    productError,
-    clearProductError,
-    isAddToCartLoading
-  };
-};

package/app-template/src/hooks/use-stock-alert.ts

@@ -1,74 +0,0 @@
-import React, { useState } from 'react';
-import { useAddStockAlertMutation } from '@akinon/next/data/client/wishlist';
-import { Trans } from '@akinon/next/components/trans';
-import { useLocalization } from '@akinon/next/hooks';
-
-interface UseStockAlertProps {
-  productPk: number;
-  userEmail?: string;
-}
-
-export const useStockAlert = ({ productPk, userEmail }: UseStockAlertProps) => {
-  const { t } = useLocalization();
-  const [isModalOpen, setIsModalOpen] = useState(false);
-  const [stockAlertResponseMessage, setStockAlertResponseMessage] = useState<React.ReactNode | null>(null);
-  const [productError, setProductError] = useState<React.ReactNode | null>(null);
-  
-  const [addStockAlert, { isLoading: isAddToStockAlertLoading }] = useAddStockAlertMutation();
-
-  const handleSuccess = () => {
-    setStockAlertResponseMessage(React.createElement(
-      Trans,
-      {
-        i18nKey: "product.stock_alert.success_description",
-        components: {
-          Email: React.createElement('span', {}, userEmail)
-        }
-      }
-    ));
-    setIsModalOpen(true);
-    setProductError(null);
-  };
-
-  const handleError = (err: any) => {
-    if (err.status !== 401) {
-      setStockAlertResponseMessage(
-        t('product.stock_alert.error_description').toString()
-      );
-      setIsModalOpen(true);
-    }
-  };
-
-  const addProductToStockAlertList = async () => {
-    try {
-      await addStockAlert({
-        productPk,
-        email: userEmail
-      })
-        .unwrap()
-        .then(handleSuccess)
-        .catch(handleError);
-    } catch (error: any) {
-      setProductError(error?.data?.non_field_errors || null);
-    }
-  };
-
-  const closeModal = () => {
-    setIsModalOpen(false);
-  };
-
-  const clearError = () => {
-    setProductError(null);
-  };
-
-  return {
-    addProductToStockAlertList,
-    isModalOpen,
-    setIsModalOpen,
-    stockAlertResponseMessage,
-    productError,
-    isAddToStockAlertLoading,
-    closeModal,
-    clearError
-  };
-};