@akinon/projectzero 2.0.0-beta.9 → 2.0.1

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

@@ -0,0 +1,58 @@
+'use client';
+
+import React, { useState, useEffect } from 'react';
+import Share from '@theme/views/share';
+import { useLocalization } from '@akinon/next/hooks';
+
+interface ProductShareProps {
+  productName: string;
+  className?: string;
+}
+
+export const ProductShare: React.FC<ProductShareProps> = ({
+  productName,
+  className
+}) => {
+  const { t } = useLocalization();
+  const [currentUrl, setCurrentUrl] = useState<string | null>(null);
+
+  useEffect(() => {
+    setCurrentUrl(window.location.href);
+  }, []);
+
+  if (!currentUrl) {
+    return null;
+  }
+
+  const shareItems = [
+    {
+      href: `https://www.facebook.com/sharer/sharer.php?u=${encodeURIComponent(
+        currentUrl
+      )}`,
+      iconName: 'facebook' as const,
+      iconSize: 22
+    },
+    {
+      href: `https://twitter.com/intent/tweet?text=${encodeURIComponent(
+        currentUrl
+      )}`,
+      iconName: 'twitter' as const,
+      iconSize: 22
+    },
+    {
+      href: `https://api.whatsapp.com/send?text=${productName}%20${encodeURIComponent(
+        currentUrl
+      )}`,
+      iconName: 'whatsapp' as const,
+      iconSize: 22
+    }
+  ];
+
+  return (
+    <Share
+      className={className}
+      buttonText={t('product.share')}
+      items={shareItems}
+    />
+  );
+};

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

@@ -0,0 +1,26 @@
+import React from 'react';
+import { Variant } from '@theme/views/product';
+import { VariantType } from '@akinon/next/types';
+
+interface ProductVariantsProps {
+  variants: VariantType[];
+  onVariantChange: () => void;
+}
+
+export const ProductVariants: React.FC<ProductVariantsProps> = ({
+  variants,
+  onVariantChange
+}) => {
+  return (
+    <div className="flex flex-col">
+      {variants.map((variant) => (
+        <Variant
+          key={variant.attribute_key}
+          {...variant}
+          className="mb-4"
+          onChange={onVariantChange}
+        />
+      ))}
+    </div>
+  );
+};

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

@@ -7,6 +7,7 @@ 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;
@@ -86,7 +87,27 @@ export default function ProductInfoSlider({ product }: ProductSliderItem) {
       </div>
 
       <div className="relative lg:col-span-5">
-        <FavButton className="absolute right-8 top-6 z-20 sm:hidden" />
+        <FavButton className="absolute right-8 top-6 z-[20] sm:hidden" />
+
+        <PluginModule
+          component={Component.ProductImageSearchFeature}
+          props={{
+            product,
+            activeIndex,
+            showResetButton: true,
+            enableTextSearch: true,
+            isEnabled: true
+          }}
+        />
+
+        <PluginModule
+          component={Component.VirtualTryOnPlugin}
+          props={{
+            product,
+            className:
+              'sm:hidden absolute bottom-[70px] right-[5px] z-[30] w-auto px-4 text-xs mt-0'
+          }}
+        />
 
         <CarouselCore
           responsive={{

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

@@ -4,7 +4,7 @@ import React, { useMemo, useCallback } from 'react';
 import { VariantOption, VariantType } from '@akinon/next/types';
 import { usePathname, useSearchParams } from 'next/navigation';
 import clsx from 'clsx';
-import { useRouter, useLocalization } from '@akinon/next/hooks';
+import { useRouter } from '@akinon/next/hooks';
 
 type VariantProps = {
   className?: string;
@@ -20,7 +20,6 @@ export const Variant = ({
   onChange,
   className
 }: VariantProps) => {
-  const { t } = useLocalization();
   const router = useRouter();
   const pathname = usePathname();
   const searchParams = useSearchParams();
@@ -30,16 +29,6 @@ export const Variant = ({
     [searchParams]
   );
 
-  const hasSelected = useMemo(
-    () => options.some((option) => option.is_selected),
-    [options]
-  );
-
-  const selectedVariant = useMemo(
-    () => options.find((option) => option.is_selected),
-    [options]
-  );
-
   const handleClick = useCallback(
     (option: VariantOption) => {
       if (onChange) {
@@ -54,44 +43,83 @@ export const Variant = ({
     [onChange, preventDefaultClick, params, attribute_key, pathname, router]
   );
 
+  // Base button classes that don't change with theme editor
+  const baseButtonClasses = 'transition-colors duration-200 tracking-[0.39px]';
+
   return (
     <div
-      className={clsx('flex flex-col gap-2', className)}
+      className={clsx('flex flex-col gap-2.5', className)}
       data-testid={`product-variant-${attribute_name}`}
     >
-      <p className="flex gap-2 text-xs leading-4">
-        <span>
-          {hasSelected
-            ? `${t('product.selected')} ${attribute_name}:`
-            : attribute_name}
-        </span>
-        {hasSelected && (
-          <span
-            className="font-bold"
-            data-testid={`product-variant-${attribute_name}-value`}
-          >
-            {selectedVariant?.value}
-          </span>
-        )}
+      <p
+        style={{
+          fontSize: 'var(--variant-label-font-size, 13px)',
+          fontWeight: 'var(--variant-label-font-weight, 400)',
+          color: 'var(--variant-label-color, #030712)'
+        }}
+      >
+        <span>{attribute_name}</span>
       </p>
-      <div className="flex gap-3 flex-wrap justify-center">
+
+      <div className="flex gap-1.5 flex-wrap">
         {options.map((option, i) => (
           <button
             key={`${i}-${option.value}`}
-            className={clsx(
-              'h-10 px-4 transition-colors duration-200 text-xs',
-              {
-                'bg-primary text-primary-foreground hover:bg-primary hover:text-primary-foreground pointer-events-none':
-                  option.is_selected,
-                'bg-gray-200 hover:bg-gray-400':
-                  option.is_selectable && !option.is_selected,
-                'border border-gray-300 text-gray-600': !option.is_selectable,
-                'cursor-not-allowed':
-                  !option.is_selectable && !option.is_selectable_without_stock,
-                'border border-dashed border-black bg-white text-gray-600 overflow-hidden relative':
-                  !option.is_selectable && option.is_selected
+            className={clsx(baseButtonClasses, {
+              'pointer-events-none': option.is_selected,
+              'cursor-not-allowed':
+                !option.is_selectable && !option.is_selectable_without_stock
+            })}
+            style={{
+              fontSize: 'var(--variant-button-font-size, 13px)',
+              fontWeight: 'var(--variant-button-font-weight, 400)',
+              height: 'var(--variant-button-height, 36px)',
+              paddingLeft: 'var(--variant-button-padding-x, 12px)',
+              paddingRight: 'var(--variant-button-padding-x, 12px)',
+              borderRadius: 'var(--variant-button-border-radius)',
+              borderWidth: 'var(--variant-button-border-width, 1px)',
+              borderStyle: 'solid',
+              ...(option.is_selected
+                ? {
+                    color: 'var(--variant-selected-color, #ffffff)',
+                    backgroundColor:
+                      'var(--variant-selected-background-color, #030712)',
+                    borderColor: 'var(--variant-selected-border-color, #030712)'
+                  }
+                : option.is_selectable
+                ? {
+                    color: 'var(--variant-button-color, #1f2937)',
+                    backgroundColor:
+                      'var(--variant-button-background-color, transparent)',
+                    borderColor: 'var(--variant-button-border-color, #9ca3af)'
+                  }
+                : {
+                    color: 'var(--variant-disabled-color, #9ca3af)',
+                    backgroundColor:
+                      'var(--variant-disabled-background-color, transparent)',
+                    borderColor: 'var(--variant-disabled-border-color, #d1d5db)'
+                  })
+            }}
+            onMouseEnter={(e) => {
+              if (option.is_selectable && !option.is_selected) {
+                e.currentTarget.style.color =
+                  'var(--variant-hover-color, #ffffff)';
+                e.currentTarget.style.backgroundColor =
+                  'var(--variant-hover-background-color, #030712)';
+                e.currentTarget.style.borderColor =
+                  'var(--variant-hover-border-color, #030712)';
+              }
+            }}
+            onMouseLeave={(e) => {
+              if (option.is_selectable && !option.is_selected) {
+                e.currentTarget.style.color =
+                  'var(--variant-button-color, #1f2937)';
+                e.currentTarget.style.backgroundColor =
+                  'var(--variant-button-background-color, transparent)';
+                e.currentTarget.style.borderColor =
+                  'var(--variant-button-border-color, #9ca3af)';
               }
-            )}
+            }}
             onClick={() => handleClick(option)}
           >
             {option.value}

package/app-template/src/views/product-pointer-banner-item.tsx

@@ -109,7 +109,7 @@ const ProductPointerWidget = (props: ProductPointerWidgetProps) => {
             hidden: buttonStatus
           })}
         >
-          <div className="w-full h-full flex items-center gap-2 shrink-0">
+          <div className="w-full h-full flex items-center gap-2 flex-shrink-0">
             <Image
               src={productItem?.kwargs?.value?.card_image?.url}
               alt={productItem?.value?.alt}

package/app-template/src/views/register/index.tsx

@@ -2,11 +2,11 @@
 
 import { yupResolver } from '@hookform/resolvers/yup';
 import clsx from 'clsx';
-import { signIn, SignInOptions } from 'next-auth/react';
+import { signIn } from 'next-auth/react';
 import { useState } from 'react';
 import { SubmitHandler, useForm } from 'react-hook-form';
 import { useAppDispatch, useAppSelector } from '@akinon/next/redux/hooks';
-import { RegisterFormType } from '@theme/types';
+import { RegisterFormType, FormType, PzSignInOptions } from '@theme/types';
 import { Button, Checkbox, Icon, Input, Modal } from '@theme/components';
 import * as yup from 'yup';
 import { useCaptcha, useLocalization, useRouter } from '@akinon/next/hooks';
@@ -120,29 +120,21 @@ export const Register = () => {
   const [showPassword, setShowPassword] = useState(false);
   const { user_phone_format } = useAppSelector((state) => state.config);
 
-  const registerHandler: SubmitHandler<RegisterFormType> = async (data) => {
+  const registerHandler = async (data: RegisterFormType) => {
     return await signIn('default', {
       redirect: false,
       callbackUrl: '/',
       captchaValidated,
-      ...data
-    } as SignInOptions);
+      ...data,
+      formType: FormType.register
+    } as PzSignInOptions & { redirect: false });
   };
 
   const onSubmit: SubmitHandler<RegisterFormType> = async (data) => {
     const registerResponse = await registerHandler(data);
 
-    if (registerResponse.error === 'Captcha') {
-      if (await validateCaptcha()) {
-        onSubmit(data);
-      }
-
-      return;
-    }
-
     if (registerResponse.error) {
-      const errors: AuthError[] = JSON.parse(registerResponse.error);
-
+      const errors: AuthError[] = JSON.parse(registerResponse.code);
 
       if (errors.find((error) => error.type === 'captcha')) {
         if (await validateCaptcha()) {
@@ -171,25 +163,25 @@ export const Register = () => {
           try {
             parsedValue = JSON.parse(item.value);
           } catch {
-            parsedValue = [item.value]; 
+            parsedValue = [item.value];
           }
         } else {
-          parsedValue = item.value; 
+          parsedValue = item.value;
         }
 
         if (Array.isArray(parsedValue)) {
           setError(item.name as keyof RegisterFormType, {
             type: 'custom',
-            message: parsedValue.join(', '),
+            message: parsedValue.join(', ')
           });
         } else {
           Object.keys(parsedValue).forEach((key) => {
             const fieldName = key as keyof RegisterFormType;
             const errorMessages = parsedValue[key] as string[];
-    
+
             setError(fieldName, {
               type: 'custom',
-              message: errorMessages.join(', '),
+              message: errorMessages.join(', ')
             });
           });
         }
@@ -217,7 +209,7 @@ export const Register = () => {
   };
 
   return (
-    <section className="w-full py-10 px-5 md:py-0 md:block md:px-8 md:mx-auto lg:px-16">
+    <section className="w-full mt-6 lg:mt-8">
       <Modal
         title={contentModal.title}
         portalId="portal-modal-container"
@@ -238,23 +230,19 @@ export const Register = () => {
           }}
         />
       )}
-      <h2 className="mb-3 text-lg text-start text-black-800 font-light md:mb-9 md:text-2xl">
-        {t('auth.register.title')}
-      </h2>
-
-      <p className="mb-3 text-xs leading-4 text-primary-400">
-        {t('auth.register.subtitle')}
-      </p>
-
       <form onSubmit={handleSubmit(onSubmit)} className="flex flex-col gap-4">
-        <input type="hidden" value="register" {...register('formType')} />
+        <input
+          type="hidden"
+          value={FormType.register}
+          {...register('formType')}
+        />
         <input type="hidden" value={locale} {...register('locale')} />
 
-        <div className={clsx({ 'mb-4': errors.email })}>
+        <div>
           <Input
             labelStyle="floating"
             label={t('auth.register.form.email.placeholder')}
-            className="h-14"
+            className="h-12"
             {...register('email')}
             error={errors.email}
             data-testid="register-email"
@@ -263,15 +251,13 @@ export const Register = () => {
         </div>
 
         <div
-          className={clsx('lg:flex', {
-            'mb-4': errors.first_name || errors.last_name
-          })}
+          className="lg:flex"
         >
           <div className="w-full lg:pr-2">
             <Input
               labelStyle="floating"
               label={t('auth.register.form.name.placeholder')}
-              className="block h-14"
+              className="block h-12"
               {...register('first_name')}
               error={errors.first_name}
               data-testid="register-name"
@@ -283,7 +269,7 @@ export const Register = () => {
             <Input
               labelStyle="floating"
               label={t('auth.register.form.surname.placeholder')}
-              className="block h-14"
+              className="block h-12"
               {...register('last_name')}
               error={errors.last_name}
               data-testid="register-surname"
@@ -292,12 +278,12 @@ export const Register = () => {
           </div>
         </div>
 
-        <div className={clsx('relative', { 'mb-4': errors.password })}>
+        <div className="relative">
           <div className="relative">
             <Input
               labelStyle="floating"
               label={t('auth.register.form.password.placeholder')}
-              className="h-14 pr-16"
+              className="h-12 pr-16"
               type={showPassword ? 'text' : 'password'}
               {...register('password')}
               data-testid="register-password"
@@ -323,11 +309,11 @@ export const Register = () => {
           />
         </div>
 
-        <div className={clsx({ 'mb-4': errors.phone })}>
+        <div>
           <Input
             labelStyle="floating"
             label={t('auth.register.form.phone.placeholder')}
-            className="h-14"
+            className="h-12"
             format={user_phone_format.replace(/9/g, '#')}
             allowEmptyFormatting
             mask="_"
@@ -343,7 +329,6 @@ export const Register = () => {
           <p className="mb-4">{t('auth.register.form.agreements.title')}:</p>
 
           <Checkbox
-            className={clsx(errors.confirm ? 'mb-8' : 'mb-4')}
             {...register('confirm')}
             error={errors.confirm}
             data-testid="register-agreement-1"
@@ -362,7 +347,7 @@ export const Register = () => {
           </Checkbox>
 
           <Checkbox
-            className={clsx(errors.kvkk_confirm ? 'mb-8' : 'mb-4')}
+            className="mt-4"
             {...register('kvkk_confirm')}
             error={errors.kvkk_confirm}
             data-testid="register-agreement-2"
@@ -381,7 +366,7 @@ export const Register = () => {
           </Checkbox>
 
           <Checkbox
-            className="mb-4"
+            className="mt-4"
             {...register('email_allowed')}
             data-testid="register-agreement-3"
           >
@@ -399,7 +384,7 @@ export const Register = () => {
           </Checkbox>
 
           <Checkbox
-            className="mb-4"
+            className="mt-4"
             {...register('sms_allowed')}
             data-testid="register-agreement-4"
           >
@@ -425,7 +410,7 @@ export const Register = () => {
         </div>
 
         <Button
-          className="text-xs font-semibold uppercase w-full h-14"
+          className="w-full h-12 text-sm font-normal"
           type="submit"
           disabled={isCaptchaVisible && !captchaValidated}
           data-testid="register-submit"

package/app-template/src/views/sales-contract-modal/index.tsx

@@ -169,19 +169,19 @@ export const SalesContractModal = ({ data }: Props) => {
               </div>
             </div>
 
-            <table className="w-full border border-gray-200">
+            <table className="w-full border">
               <thead className="text-sm">
                 <tr>
-                  <th className="border border-gray-200 font-normal text-left py-2 px-3">
+                  <th className="border font-normal text-left py-2 px-3">
                     {t('account.sales_contract.product')}
                   </th>
-                  <th className="border border-gray-200 font-normal py-2 px-3">
+                  <th className="border font-normal py-2 px-3">
                     {t('account.sales_contract.quantity')}
                   </th>
-                  <th className="border border-gray-200 font-normal text-left py-2 px-3">
+                  <th className="border font-normal text-left py-2 px-3">
                     {t('account.sales_contract.product_price')}
                   </th>
-                  <th className="border border-gray-200 font-normal text-left py-2 px-3">
+                  <th className="border font-normal text-left py-2 px-3">
                     {t('account.sales_contract.total_price')}
                   </th>
                 </tr>
@@ -191,20 +191,20 @@ export const SalesContractModal = ({ data }: Props) => {
                 {data.orderitem_set.map((value, index) => {
                   return (
                     <tr key={index.toString()}>
-                      <td className="border border-gray-200 font-light text-left py-2 px-3">
+                      <td className="border font-light text-left py-2 px-3">
                         {value.product.name}
                       </td>
-                      <td className="border border-gray-200 font-light text-center py-2 px-3">
+                      <td className="border font-light text-center py-2 px-3">
                         {value.quantity ? value.quantity : '1'}
                       </td>
-                      <td className="border border-gray-200 font-light text-center py-2 px-3">
+                      <td className="border font-light text-center py-2 px-3">
                         <Price
                           value={
                             value.unit_price ? value.unit_price : value.price
                           }
                         />
                       </td>
-                      <td className="border border-gray-200 font-light text-right py-2 px-3">
+                      <td className="border font-light text-right py-2 px-3">
                         <Price
                           value={
                             value.total_amount
@@ -222,12 +222,12 @@ export const SalesContractModal = ({ data }: Props) => {
                 <tr>
                   <th
                     colSpan={3}
-                    className="border border-gray-200 text-left py-2 px-3 font-normal"
+                    className="border text-left py-2 px-3 font-normal"
                   >
                     {t('account.sales_contract.products_total')}
                   </th>
                   <td
-                    className="border border-gray-200 text-right py-2 px-3 font-light"
+                    className="border text-right py-2 px-3 font-light"
                     colSpan={1}
                   >
                     <Price value={data.discount_amount} />
@@ -237,12 +237,12 @@ export const SalesContractModal = ({ data }: Props) => {
                 <tr>
                   <th
                     colSpan={3}
-                    className="border border-gray-200 text-left py-2 px-3 font-normal"
+                    className="border text-left py-2 px-3 font-normal"
                   >
                     {t('account.sales_contract.shipping_price')}
                   </th>
                   <td
-                    className="border border-gray-200 text-right py-2 px-3 font-light"
+                    className="border text-right py-2 px-3 font-light"
                     colSpan={1}
                   >
                     <Price value={data.shipping_amount} />
@@ -252,12 +252,12 @@ export const SalesContractModal = ({ data }: Props) => {
                 <tr>
                   <th
                     colSpan={3}
-                    className="border border-gray-200 text-left py-2 px-3 font-normal"
+                    className="border text-left py-2 px-3 font-normal"
                   >
                     {t('account.sales_contract.payment_type')}
                   </th>
                   <td
-                    className="border border-gray-200 text-right py-2 px-3 font-light"
+                    className="border text-right py-2 px-3 font-light"
                     colSpan={1}
                   >
                     {data.payment_option_slug}
@@ -267,12 +267,12 @@ export const SalesContractModal = ({ data }: Props) => {
                 <tr>
                   <th
                     colSpan={3}
-                    className="border border-gray-200 text-left py-2 px-3 font-normal"
+                    className="border text-left py-2 px-3 font-normal"
                   >
                     {t('account.sales_contract.order_total')}
                   </th>
                   <td
-                    className="border border-gray-200 text-right py-2 px-3 font-light"
+                    className="border text-right py-2 px-3 font-light"
                     colSpan={1}
                   >
                     <Price value={data.amount} />

package/app-template/src/views/share/index.tsx

@@ -4,7 +4,7 @@ import React, { useState } from 'react';
 import { Button, Icon } from '@theme/components';
 // eslint-disable-next-line @akinon/projectzero/link-import
 import Link from 'next/link';
-import { ShareProps } from '@theme/components/types';
+import { ShareProps } from '@theme/components/types/index';
 import clsx from 'clsx';
 
 const Share = ({
@@ -13,18 +13,21 @@ const Share = ({
   buttonAppearance = 'ghost',
   className,
   buttonIconName = 'share',
-  buttonIconSize = 16,
+  buttonIconSize = 24,
   buttonIconProps = {},
   items
 }: ShareProps) => {
   const [open, setOpen] = useState(false);
 
   return (
-    <div className={clsx('flex items-center', className)}>
+    <div className={clsx('flex items-center gap-4 border-t', className)}>
       <Button
         onClick={() => setOpen(!open)}
         appearance={buttonAppearance}
-        className={clsx('text-base', buttonClassName)}
+        className={clsx(
+          'text-base p-0 bg-transparent hover:bg-transparent hover:text-primary',
+          buttonClassName
+        )}
         aria-label="Share"
       >
         <div className="flex items-center gap-2">
@@ -53,12 +56,12 @@ const Share = ({
               className={
                 item.className
                   ? item.className
-                  : 'px-6 py-2 h-10 flex items-center hover:bg-gray-100'
+                  : 'p-4 h-auto flex items-center hover:bg-gray-100'
               }
             >
               <Icon
                 name={item.iconName}
-                size={item.iconSize ? item.iconSize : 16}
+                size={item.iconSize ? item.iconSize : 12}
               />
             </Link>
           </div>