@akinon/projectzero 1.108.0 → 1.109.0-rc.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (31) hide show
  1. package/CHANGELOG.md +7 -0
  2. package/app-template/.env.example +2 -0
  3. package/app-template/CHANGELOG.md +45 -0
  4. package/app-template/README.md +25 -1
  5. package/app-template/package.json +23 -20
  6. package/app-template/public/locales/en/account.json +3 -1
  7. package/app-template/public/locales/en/common.json +42 -1
  8. package/app-template/public/locales/en/product.json +23 -1
  9. package/app-template/public/locales/tr/account.json +3 -1
  10. package/app-template/public/locales/tr/common.json +42 -1
  11. package/app-template/public/locales/tr/product.json +22 -0
  12. package/app-template/src/app/[commerce]/[locale]/[currency]/account/orders/[id]/page.tsx +20 -1
  13. package/app-template/src/app/api/image-proxy/route.ts +1 -0
  14. package/app-template/src/app/api/similar-product-list/route.ts +1 -0
  15. package/app-template/src/app/api/similar-products/route.ts +1 -0
  16. package/app-template/src/app/api/virtual-try-on/limited-categories/route.ts +1 -0
  17. package/app-template/src/app/api/virtual-try-on/route.ts +1 -0
  18. package/app-template/src/components/modal.tsx +2 -0
  19. package/app-template/src/components/select.tsx +1 -1
  20. package/app-template/src/hooks/index.ts +2 -0
  21. package/app-template/src/plugins.js +6 -1
  22. package/app-template/src/views/account/orders/order-detail-header.tsx +1 -1
  23. package/app-template/src/views/checkout/steps/shipping/address-box.tsx +30 -17
  24. package/app-template/src/views/checkout/steps/shipping/addresses.tsx +1 -1
  25. package/app-template/src/views/header/search/index.tsx +26 -5
  26. package/app-template/src/views/product/layout.tsx +15 -1
  27. package/app-template/src/views/product/product-info.tsx +8 -0
  28. package/app-template/src/views/product/slider.tsx +86 -73
  29. package/commands/plugins.ts +12 -0
  30. package/dist/commands/plugins.js +12 -0
  31. package/package.json +1 -1
package/CHANGELOG.md CHANGED
@@ -1,5 +1,12 @@
1
1
  # @akinon/projectzero
2
2
 
3
+ ## 1.109.0-rc.11
4
+
5
+ ### Minor Changes
6
+
7
+ - 143be2b9: ZERO-3457: Crop styles are customizable and logic improved for rendering similar products modal
8
+ - d99a6a7d: ZERO-3457_1: Fixed the settings prop and made sure everything is customizable.
9
+
3
10
  ## 1.108.0
4
11
 
5
12
  ## 1.107.0
@@ -6,6 +6,8 @@ NEXT_PUBLIC_GTM_KEY=GTM_KEY
6
6
  NEXT_PUBLIC_URL=http://localhost:3000
7
7
  SERVICE_BACKEND_URL=https://02fde10fee4440269e695aa10707dfaf.lb.akinoncloud.com
8
8
  SITEMAP_S3_BUCKET_NAME=0fb534
9
+ NEXT_PUBLIC_VIRTUAL_TRY_ON_API_URL=https://d2a26507c7094f359aba349b96a96881.lb.akinoncloud.com
10
+ NEXT_PUBLIC_ENABLE_IMAGE_SEARCH=true
9
11
 
10
12
  # LOG_LEVEL_DEV=debug # For more details, please refer to the Logging documentation.
11
13
 
@@ -1,5 +1,50 @@
1
1
  # projectzeronext
2
2
 
3
+ ## 1.109.0-rc.11
4
+
5
+ ### Minor Changes
6
+
7
+ - 4449f3a3: ZERO-3681: Add order details localization and improve order handling in AccountOrderDetail
8
+ - 1a8622a9: ZERO-3392: Implemented AI Search functionality and update env
9
+ - b55acb76: ZERO-2577: Fix pagination bug and update usePagination hook and ensure pagination controls rendering correctly
10
+ - 143be2b9: ZERO-3457: Crop styles are customizable and logic improved for rendering similar products modal
11
+ - 9f8cd3bc: ZERO-3449: AI Search Active Filters & Crop Style changes have been implemented
12
+ - d99a6a7d: ZERO-3457_1: Fixed the settings prop and made sure everything is customizable.
13
+ - b87517ff: ZERO-3680: Enhance select component styling to ensure focus state is consistent
14
+ - fcbbea79: ZERO-3648: Add virtual try-on feature with localization support
15
+ - b05c3543: ZERO-2570: Category filters routes to absolute url
16
+
17
+ ### Patch Changes
18
+
19
+ - Updated dependencies [d2c0e759]
20
+ - Updated dependencies [b55acb76]
21
+ - Updated dependencies [143be2b9]
22
+ - Updated dependencies [9f8cd3bc]
23
+ - Updated dependencies [d99a6a7d]
24
+ - Updated dependencies [4de5303c]
25
+ - Updated dependencies [fcbbea79]
26
+ - @akinon/next@1.109.0-rc.11
27
+ - @akinon/pz-akifast@1.109.0-rc.11
28
+ - @akinon/pz-apple-pay@1.109.0-rc.11
29
+ - @akinon/pz-b2b@1.109.0-rc.11
30
+ - @akinon/pz-basket-gift-pack@1.109.0-rc.11
31
+ - @akinon/pz-bkm@1.109.0-rc.11
32
+ - @akinon/pz-checkout-gift-pack@1.109.0-rc.11
33
+ - @akinon/pz-click-collect@1.109.0-rc.11
34
+ - @akinon/pz-credit-payment@1.109.0-rc.11
35
+ - @akinon/pz-cybersource-uc@1.109.0-rc.11
36
+ - @akinon/pz-flow-payment@1.109.0-rc.11
37
+ - @akinon/pz-gpay@1.109.0-rc.11
38
+ - @akinon/pz-hepsipay@1.109.0-rc.11
39
+ - @akinon/pz-masterpass@1.109.0-rc.11
40
+ - @akinon/pz-multi-basket@1.109.0-rc.11
41
+ - @akinon/pz-one-click-checkout@1.109.0-rc.11
42
+ - @akinon/pz-otp@1.109.0-rc.11
43
+ - @akinon/pz-pay-on-delivery@1.109.0-rc.11
44
+ - @akinon/pz-saved-card@1.109.0-rc.11
45
+ - @akinon/pz-tabby-extension@1.109.0-rc.11
46
+ - @akinon/pz-tamara-extension@1.109.0-rc.11
47
+
3
48
  ## 1.108.0
4
49
 
5
50
  ### Minor Changes
@@ -12,6 +12,30 @@ Run `cp .env.example .env && yarn` command at project root and all dependencies
12
12
 
13
13
  - `SITEMAP_S3_BUCKET_NAME`: S3 bucket name for XML sitemaps (e.g., "0fb534"). This is required for the sitemap route to function correctly.
14
14
 
15
+ ### Optional Environment Variables
16
+
17
+ - `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.
18
+
19
+ ## Image Search Feature
20
+
21
+ The image search functionality allows users to search for similar products by uploading images or cropping existing product images.
22
+
23
+ ### Feature Visibility Control
24
+
25
+ The image search feature can be controlled in two ways:
26
+
27
+ 1. **Environment Variable (Global)**: Set `NEXT_PUBLIC_ENABLE_IMAGE_SEARCH=true` to enable for all users
28
+ 2. **localStorage (Individual Users)**: Users can enable it locally using browser developer tools
29
+
30
+ ````
31
+
32
+ ### Feature Locations
33
+
34
+ When enabled, the image search feature appears in:
35
+
36
+ - **Header Search**: Camera icon next to the search input
37
+ - **Product Detail Page**: "View Similar Styles" button on product images
38
+
15
39
  ### Build
16
40
 
17
41
  To build the app, run the following command:
@@ -19,7 +43,7 @@ To build the app, run the following command:
19
43
  ```bash
20
44
  cd projectzeronext # Project root
21
45
  yarn build
22
- ```
46
+ ````
23
47
 
24
48
  ### Develop
25
49
 
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "projectzeronext",
3
- "version": "1.108.0",
3
+ "version": "1.109.0-rc.11",
4
4
  "private": true,
5
5
  "license": "MIT",
6
6
  "scripts": {
@@ -24,24 +24,27 @@
24
24
  "test:middleware": "jest middleware-matcher.test.ts --bail"
25
25
  },
26
26
  "dependencies": {
27
- "@akinon/next": "1.108.0",
28
- "@akinon/pz-akifast": "1.108.0",
29
- "@akinon/pz-b2b": "1.108.0",
30
- "@akinon/pz-basket-gift-pack": "1.108.0",
31
- "@akinon/pz-bkm": "1.108.0",
32
- "@akinon/pz-checkout-gift-pack": "1.108.0",
33
- "@akinon/pz-click-collect": "1.108.0",
34
- "@akinon/pz-credit-payment": "1.108.0",
35
- "@akinon/pz-cybersource-uc": "1.108.0",
36
- "@akinon/pz-gpay": "1.108.0",
37
- "@akinon/pz-hepsipay": "1.108.0",
38
- "@akinon/pz-masterpass": "1.108.0",
39
- "@akinon/pz-one-click-checkout": "1.108.0",
40
- "@akinon/pz-otp": "1.108.0",
41
- "@akinon/pz-pay-on-delivery": "1.108.0",
42
- "@akinon/pz-saved-card": "1.108.0",
43
- "@akinon/pz-tabby-extension": "1.108.0",
44
- "@akinon/pz-tamara-extension": "1.108.0",
27
+ "@akinon/next": "1.109.0-rc.11",
28
+ "@akinon/pz-akifast": "1.109.0-rc.11",
29
+ "@akinon/pz-apple-pay": "1.109.0-rc.11",
30
+ "@akinon/pz-b2b": "1.109.0-rc.11",
31
+ "@akinon/pz-basket-gift-pack": "1.109.0-rc.11",
32
+ "@akinon/pz-bkm": "1.109.0-rc.11",
33
+ "@akinon/pz-checkout-gift-pack": "1.109.0-rc.11",
34
+ "@akinon/pz-click-collect": "1.109.0-rc.11",
35
+ "@akinon/pz-credit-payment": "1.109.0-rc.11",
36
+ "@akinon/pz-cybersource-uc": "1.109.0-rc.11",
37
+ "@akinon/pz-flow-payment": "1.109.0-rc.11",
38
+ "@akinon/pz-gpay": "1.109.0-rc.11",
39
+ "@akinon/pz-hepsipay": "1.109.0-rc.11",
40
+ "@akinon/pz-masterpass": "1.109.0-rc.11",
41
+ "@akinon/pz-multi-basket": "1.109.0-rc.11",
42
+ "@akinon/pz-one-click-checkout": "1.109.0-rc.11",
43
+ "@akinon/pz-otp": "1.109.0-rc.11",
44
+ "@akinon/pz-pay-on-delivery": "1.109.0-rc.11",
45
+ "@akinon/pz-saved-card": "1.109.0-rc.11",
46
+ "@akinon/pz-tabby-extension": "1.109.0-rc.11",
47
+ "@akinon/pz-tamara-extension": "1.109.0-rc.11",
45
48
  "@hookform/resolvers": "2.9.0",
46
49
  "@next/third-parties": "14.1.0",
47
50
  "@react-google-maps/api": "2.17.1",
@@ -64,7 +67,7 @@
64
67
  "yup": "0.32.11"
65
68
  },
66
69
  "devDependencies": {
67
- "@akinon/eslint-plugin-projectzero": "1.108.0",
70
+ "@akinon/eslint-plugin-projectzero": "1.109.0-rc.11",
68
71
  "@semantic-release/changelog": "6.0.2",
69
72
  "@semantic-release/exec": "6.0.3",
70
73
  "@semantic-release/git": "10.0.1",
@@ -242,7 +242,9 @@
242
242
  "total": "Total",
243
243
  "items": "items",
244
244
  "packages": "Packages",
245
- "package_no": "Package no"
245
+ "package_no": "Package no",
246
+ "back_to_orders": "Back to Orders",
247
+ "no_orders_found": "No orders found"
246
248
  },
247
249
  "return": {
248
250
  "title": "Return Items",
@@ -27,7 +27,25 @@
27
27
  "clean": "clean",
28
28
  "categories": "CATEGORIES",
29
29
  "view_all": "VIEW ALL",
30
- "not_found": "Search Results Not Found"
30
+ "not_found": "Search Results Not Found",
31
+ "image_search": {
32
+ "title": "Search by Image",
33
+ "upload_image": "Upload an image to find similar products",
34
+ "select_image": "Select Image",
35
+ "crop_image": "Crop Image",
36
+ "cancel_crop": "Cancel Crop",
37
+ "apply_crop": "Apply Crop",
38
+ "try_another": "Try Another Image",
39
+ "search_image": "Search Image",
40
+ "similar_products": "Similar Products",
41
+ "loading_cropper": "Loading cropper...",
42
+ "no_products": "No similar products found",
43
+ "best_results": "For best results:",
44
+ "tip_1": "Upload clear images of products",
45
+ "tip_2": "Use images with simple backgrounds",
46
+ "tip_3": "Focus on the main product",
47
+ "tip_4": "Use the crop tool to focus on specific details"
48
+ }
31
49
  },
32
50
  "page_404": {
33
51
  "title": "Page not found.",
@@ -72,6 +90,29 @@
72
90
  "select_file": "Select File",
73
91
  "no_file": "No file selected"
74
92
  },
93
+ "product": {
94
+ "no_products": "No products found",
95
+ "new_image": "New Image",
96
+ "view_similar_styles": "View Similar Styles",
97
+ "clear_all_filters": "Clear All Filters",
98
+ "reset_to_original": "Reset to Original",
99
+ "similar_styles": "Similar Styles",
100
+ "filters": "Filters",
101
+ "active_filters": "Active Filters"
102
+ },
103
+ "similar_products": {
104
+ "errors": {
105
+ "file_size_too_large": "Image size should be less than 5MB",
106
+ "invalid_image_file": "The selected file is not a valid image",
107
+ "invalid_image_format": "Invalid image format detected",
108
+ "search_failed": "Search failed. Please try again later",
109
+ "connection_failed": "Image search failed. Please check your connection and try again",
110
+ "invalid_image_properties": "Invalid image properties detected",
111
+ "file_read_error": "Error reading the file",
112
+ "processing_error": "Error processing image",
113
+ "crop_processing_error": "Error processing cropped image"
114
+ }
115
+ },
75
116
  "forms": {
76
117
  "sending": "Sending...",
77
118
  "success": "Form submitted successfully!",
@@ -32,8 +32,30 @@
32
32
  "installment": "Installment",
33
33
  "stock_alert": {
34
34
  "title": "Stock Alert",
35
- "success_description": "When your size is back in stock well send an email to: <Email/>",
35
+ "success_description": "When your size is back in stock we'll send an email to: <Email/>",
36
36
  "error_description": "An unexpected error has occured. Please try again later.",
37
37
  "close_button": "CLOSE"
38
+ },
39
+ "virtual_try_on": {
40
+ "title": "Virtual Try On",
41
+ "button_text": "Virtual Try On",
42
+ "loading": "Loading...",
43
+ "upload_title": "Upload Your Photo",
44
+ "upload_prompt": "Click to upload image",
45
+ "upload_requirements": "Max 1MB, JPEG/PNG/WebP only",
46
+ "instructions": "Upload a clear photo of yourself for the best virtual try-on experience. Make sure you are facing the camera directly.",
47
+ "try_on": "Try On",
48
+ "processing": "Processing...",
49
+ "processing_message": "Creating your virtual try-on...",
50
+ "result_title": "Virtual Try-On Result",
51
+ "result_placeholder": "Upload your photo to see the result",
52
+ "error": "Virtual try-on failed. Please try again.",
53
+ "feedback_prompt": "How did the virtual try-on work for you?",
54
+ "reset_crop": "Reset Crop",
55
+ "legal": {
56
+ "title": "Terms & Conditions",
57
+ "text": "By using this virtual try-on feature, you agree to our terms and conditions. Your image will be processed securely and not stored permanently. We use your photo only to generate the virtual try-on result.",
58
+ "accept": "I Accept & Continue"
59
+ }
38
60
  }
39
61
  }
@@ -242,7 +242,9 @@
242
242
  "total": "Toplam",
243
243
  "items": "adet",
244
244
  "packages": "paket",
245
- "package_no": "Paket no"
245
+ "package_no": "Paket no",
246
+ "back_to_orders": "Siparişlere geri dön",
247
+ "no_orders_found": "Sipariş bulunamadı"
246
248
  },
247
249
  "return": {
248
250
  "title": "İade Ürünleri",
@@ -27,7 +27,25 @@
27
27
  "clean": "temizle",
28
28
  "categories": "KATEGORİLER",
29
29
  "view_all": "HEPSİNİ GÖSTER",
30
- "not_found": "Arama Sonuçları Bulunamadı"
30
+ "not_found": "Arama Sonuçları Bulunamadı",
31
+ "image_search": {
32
+ "title": "Görsel ile Ara",
33
+ "upload_image": "Benzer ürünleri bulmak için bir görsel yükleyin",
34
+ "select_image": "Görsel Seç",
35
+ "crop_image": "Görsel Kırp",
36
+ "cancel_crop": "Kırpmayı İptal Et",
37
+ "apply_crop": "Kırpmayı Uygula",
38
+ "try_another": "Başka Görsel Dene",
39
+ "search_image": "Arama Görseli",
40
+ "similar_products": "Benzer Ürünler",
41
+ "loading_cropper": "Kırpıcı yükleniyor...",
42
+ "no_products": "Benzer ürün bulunamadı",
43
+ "best_results": "En iyi sonuçlar için:",
44
+ "tip_1": "Net ürün görselleri yükleyin",
45
+ "tip_2": "Basit arka planlı görseller kullanın",
46
+ "tip_3": "Ana ürüne odaklanın",
47
+ "tip_4": "Belirli detaylara odaklanmak için kırpma aracını kullanın"
48
+ }
31
49
  },
32
50
  "page_404": {
33
51
  "title": "Sayfa bulunamadı.",
@@ -72,6 +90,29 @@
72
90
  "select_file": "Dosya Seç",
73
91
  "no_file": "Dosya seçilmedi"
74
92
  },
93
+ "product": {
94
+ "no_products": "Ürün bulunamadı",
95
+ "new_image": "Yeni Görsel",
96
+ "view_similar_styles": "Benzer Stillere Göz At",
97
+ "clear_all_filters": "Tüm Filtreleri Temizle",
98
+ "reset_to_original": "Orjinale Dön",
99
+ "similar_styles": "Benzer Stillere Göz At",
100
+ "filters": "Filtreler",
101
+ "active_filters": "Aktif Filtreler"
102
+ },
103
+ "similar_products": {
104
+ "errors": {
105
+ "file_size_too_large": "Görsel boyutu 5MB'dan küçük olmalıdır",
106
+ "invalid_image_file": "Seçilen dosya geçerli bir görsel değil",
107
+ "invalid_image_format": "Geçersiz görsel formatı tespit edildi",
108
+ "search_failed": "Arama başarısız oldu. Lütfen daha sonra tekrar deneyin",
109
+ "connection_failed": "Görsel arama başarısız oldu. Lütfen bağlantınızı kontrol edip tekrar deneyin",
110
+ "invalid_image_properties": "Geçersiz görsel özellikleri tespit edildi",
111
+ "file_read_error": "Dosya okuma hatası",
112
+ "processing_error": "Görsel işleme hatası",
113
+ "crop_processing_error": "Kırpılan görsel işleme hatası"
114
+ }
115
+ },
75
116
  "forms": {
76
117
  "sending": "Gönderiliyor...",
77
118
  "success": "Form başarıyla gönderildi!",
@@ -35,5 +35,27 @@
35
35
  "success_description": "Bedeniniz stoklara tekrar girdiğinde şu adrese bir e-posta göndereceğiz: <Email/>",
36
36
  "error_description": "Beklenmeyen bir hata oluştu. Lütfen daha sonra tekrar deneyiniz.",
37
37
  "close_button": "KAPAT"
38
+ },
39
+ "virtual_try_on": {
40
+ "title": "Sanal Deneme",
41
+ "button_text": "Sanal Deneme",
42
+ "loading": "Yükleniyor...",
43
+ "upload_title": "Fotoğrafınızı Yükleyin",
44
+ "upload_prompt": "Resim yüklemek için tıklayın",
45
+ "upload_requirements": "Maks 1MB, sadece JPEG/PNG/WebP",
46
+ "instructions": "En iyi sanal deneme deneyimi için net bir fotoğrafınızı yükleyin. Kameraya doğrudan baktığınızdan emin olun.",
47
+ "try_on": "Dene",
48
+ "processing": "İşleniyor...",
49
+ "processing_message": "Sanal denemeniz oluşturuluyor...",
50
+ "result_title": "Sanal Deneme Sonucu",
51
+ "result_placeholder": "Sonucu görmek için fotoğrafınızı yükleyin",
52
+ "error": "Sanal deneme başarısız oldu. Lütfen tekrar deneyin.",
53
+ "feedback_prompt": "Sanal deneme sizin için nasıldı?",
54
+ "reset_crop": "Kırpma Sıfırla",
55
+ "legal": {
56
+ "title": "Şartlar ve Koşullar",
57
+ "text": "Bu sanal deneme özelliğini kullanarak şartlar ve koşullarımızı kabul etmiş olursunuz. Fotoğrafınız güvenli bir şekilde işlenecek ve kalıcı olarak saklanmayacaktır. Fotoğrafınızı yalnızca sanal deneme sonucunu oluşturmak için kullanırız.",
58
+ "accept": "Kabul Ediyorum & Devam Et"
59
+ }
38
60
  }
39
61
  }
@@ -61,7 +61,26 @@ const AccountOrderDetail = ({ params: { id } }) => {
61
61
  }, [order, isSuccess, localeValue]);
62
62
 
63
63
  if (isLoading && isFetching) {
64
- return <LoaderSpinner />;
64
+ return (
65
+ <div className="flex flex-col items-center justify-center h-96">
66
+ <LoaderSpinner />
67
+ </div>
68
+ );
69
+ }
70
+
71
+ if (!order) {
72
+ return (
73
+ <div className="flex flex-col items-center justify-center h-96">
74
+ <p className="mt-5 text-start text-lg mb-4">
75
+ {t('account.my_orders.detail.no_orders_found')}
76
+ </p>
77
+ <Link href={`/account/orders/`}>
78
+ <Button className="px-4" appearance="filled">
79
+ {t('account.my_orders.detail.back_to_orders')}
80
+ </Button>
81
+ </Link>
82
+ </div>
83
+ );
65
84
  }
66
85
 
67
86
  return (
@@ -0,0 +1 @@
1
+ export * from '@akinon/next/api/image-proxy';
@@ -0,0 +1 @@
1
+ export * from '@akinon/next/api/similar-product-list';
@@ -0,0 +1 @@
1
+ export * from '@akinon/next/api/similar-products';
@@ -0,0 +1 @@
1
+ export * from '@akinon/next/api/virtual-try-on';
@@ -0,0 +1 @@
1
+ export * from '@akinon/next/api/virtual-try-on';
@@ -41,12 +41,14 @@ export const Modal = (props: ModalProps) => {
41
41
  'fixed top-0 left-0 w-screen h-screen bg-primary bg-opacity-60 z-50',
42
42
  overlayClassName
43
43
  )}
44
+ onClick={(e) => e.stopPropagation()}
44
45
  />
45
46
  <section
46
47
  className={twMerge(
47
48
  'fixed top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 z-50 bg-white',
48
49
  className
49
50
  )}
51
+ onClick={(e) => e.stopPropagation()}
50
52
  >
51
53
  {(showCloseButton || title) && (
52
54
  <div
@@ -48,7 +48,7 @@ const Select = forwardRef<HTMLSelectElement, SelectProps>((props, ref) => {
48
48
  clsx(
49
49
  'cursor-pointer truncate h-10 w-40 px-2.5 shrink-0 outline-none',
50
50
  !borderless &&
51
- 'border border-gray-200 transition-all duration-150 hover:border-primary',
51
+ 'border border-gray-200 transition-all duration-150 hover:border-primary focus:border-primary',
52
52
  'appearance-none bg-transparent'
53
53
  ),
54
54
  className
@@ -1 +1,3 @@
1
+ export * from './use-contract';
2
+ export * from './use-fav-button';
1
3
  export * from './use-add-product-to-basket';
@@ -1,4 +1,3 @@
1
- // we are holding all of the plugins because of the development enviroment.
2
1
  module.exports = [
3
2
  'pz-basket-gift-pack',
4
3
  'pz-click-collect',
@@ -12,9 +11,15 @@ module.exports = [
12
11
  'pz-masterpass',
13
12
  'pz-b2b',
14
13
  'pz-akifast',
14
+ 'pz-multi-basket',
15
15
  'pz-saved-card',
16
16
  'pz-tabby-extension',
17
+ 'pz-apple-pay',
17
18
  'pz-tamara-extension',
19
+ 'pz-hepsipay',
20
+ 'pz-flow-payment',
21
+ 'pz-virtual-try-on',
22
+ 'pz-similar-products',
18
23
  'pz-cybersource-uc',
19
24
  'pz-hepsipay'
20
25
  ];
@@ -21,7 +21,7 @@ export const OrderDetailHeader = ({ title, order, children }: Props) => {
21
21
  <div>
22
22
  <span>{t('account.my_orders.detail.order_number')}</span>:{' '}
23
23
  <span data-testid="account-orders-return-order-id">
24
- {order.number}
24
+ {order?.number}
25
25
  </span>
26
26
  </div>
27
27
 
@@ -85,7 +85,7 @@ const AddressBox = ({
85
85
  };
86
86
 
87
87
  const onSubmit = (data) => {
88
- editAddress({ ...data, invalidateTag: 'Addresses' })
88
+ editAddress({ ...data, invalidateTag: 'Checkout' })
89
89
  .unwrap()
90
90
  .then((editAddressResponse) => {
91
91
  handleAddressClick(addressType, editAddressResponse);
@@ -96,7 +96,7 @@ const AddressBox = ({
96
96
  };
97
97
 
98
98
  const handleRemoveAddress = async (addressPk: number) => {
99
- await removeAddress({ id: addressPk, invalidateTag: 'Addresses' });
99
+ await removeAddress({ id: addressPk, invalidateTag: 'Checkout' });
100
100
  setRemoveAddressModalOpen(false);
101
101
  dispatch(resetCheckoutState());
102
102
 
@@ -168,7 +168,10 @@ const AddressBox = ({
168
168
  <Button
169
169
  appearance="ghost"
170
170
  className="italic underline hover:text-secondary-500 hover:!bg-white hover:!border-white p-0 h-auto"
171
- onClick={() => setIsEditAddressModalOpen(true)}
171
+ onClick={(e) => {
172
+ e.stopPropagation();
173
+ setIsEditAddressModalOpen(true);
174
+ }}
172
175
  data-testid="checkout-address-edit"
173
176
  >
174
177
  {t('checkout.address.box.edit')}
@@ -180,21 +183,26 @@ const AddressBox = ({
180
183
  setOpen={setIsEditAddressModalOpen}
181
184
  className="w-full sm:w-[28rem] max-h-[90vh] overflow-y-auto"
182
185
  >
183
- <AddressForm
184
- data={{
185
- ...address,
186
- country: address.country?.pk,
187
- city: address.city?.pk,
188
- township: address.township?.pk,
189
- district: address.district?.pk
190
- }}
191
- onSubmit={onSubmit}
192
- />
186
+ <div onClick={(e) => e.stopPropagation()}>
187
+ <AddressForm
188
+ data={{
189
+ ...address,
190
+ country: address.country?.pk,
191
+ city: address.city?.pk,
192
+ township: address.township?.pk,
193
+ district: address.district?.pk
194
+ }}
195
+ onSubmit={onSubmit}
196
+ />
197
+ </div>
193
198
  </Modal>
194
199
  <Button
195
200
  appearance="ghost"
196
201
  className="italic underline hover:text-secondary-500 hover:!bg-white hover:!border-white p-0 h-auto"
197
- onClick={() => setRemoveAddressModalOpen(true)}
202
+ onClick={(e) => {
203
+ e.stopPropagation();
204
+ setRemoveAddressModalOpen(true);
205
+ }}
198
206
  data-testid="checkout-address-remove"
199
207
  >
200
208
  {t('checkout.address.box.remove')}
@@ -207,14 +215,18 @@ const AddressBox = ({
207
215
  setOpen={setRemoveAddressModalOpen}
208
216
  showCloseButton={false}
209
217
  >
210
- <div className="text-center px-6 py-10">
218
+ <div
219
+ className="text-center px-6 py-10"
220
+ onClick={(e) => e.stopPropagation()}
221
+ >
211
222
  <p className="mb-4">
212
223
  {t('account.address_book.modal.delete_description')}
213
224
  </p>
214
225
  <div className="space-x-3 flex justify-center">
215
226
  <Button
216
227
  appearance="outlined"
217
- onClick={() => {
228
+ onClick={(e) => {
229
+ e.stopPropagation();
218
230
  setRemoveAddressModalOpen(false);
219
231
  }}
220
232
  data-testid="remove-address-modal-cancel"
@@ -224,7 +236,8 @@ const AddressBox = ({
224
236
  <Button
225
237
  appearance="filled"
226
238
  disabled={removeAddressLoading}
227
- onClick={() => {
239
+ onClick={(e) => {
240
+ e.stopPropagation();
228
241
  handleRemoveAddress(address.pk);
229
242
  }}
230
243
  className={
@@ -77,7 +77,7 @@ const Addresses = () => {
77
77
  }, [billing_and_shipping_same]);
78
78
 
79
79
  const onSubmit = (data) => {
80
- addAddress({ ...data, invalidateTag: 'Addresses' })
80
+ addAddress({ ...data, invalidateTag: 'Checkout' })
81
81
  .unwrap()
82
82
  .then((addAddressResponse) => {
83
83
  if (addressList.length === 0) {
@@ -4,11 +4,11 @@ import { useEffect, useRef, useState } from 'react';
4
4
  import { useAppDispatch, useAppSelector } from '@akinon/next/redux/hooks';
5
5
  import { closeSearch } from '@akinon/next/redux/reducers/header';
6
6
  import clsx from 'clsx';
7
-
8
- import { Icon } from '@theme/components';
7
+ import { Icon, Input } from '@theme/components';
9
8
  import Results from './results';
10
9
  import { ROUTES } from '@theme/routes';
11
10
  import { useLocalization, useRouter } from '@akinon/next/hooks';
11
+ import PluginModule, { Component } from '@akinon/next/components/plugin-module';
12
12
 
13
13
  export default function Search() {
14
14
  const { t } = useLocalization();
@@ -41,6 +41,14 @@ export default function Search() {
41
41
  };
42
42
  }, [isSearchOpen, dispatch]);
43
43
 
44
+ const handleSearchTextChange = (e: React.ChangeEvent<HTMLInputElement>) => {
45
+ setSearchText(e.target.value);
46
+ };
47
+
48
+ const handleCloseSearch = () => {
49
+ dispatch(closeSearch());
50
+ };
51
+
44
52
  return (
45
53
  <>
46
54
  <div
@@ -66,9 +74,9 @@ export default function Search() {
66
74
  {t('common.search.results_for')}
67
75
  </span>
68
76
  <div className="flex items-center">
69
- <input
77
+ <Input
70
78
  value={searchText}
71
- onChange={(e) => setSearchText(e.target.value)}
79
+ onChange={handleSearchTextChange}
72
80
  onKeyDown={(e) => {
73
81
  if (e.key === 'Enter' && searchText.trim() !== '') {
74
82
  router.push(`${ROUTES.LIST}/?search_text=${searchText}`);
@@ -78,14 +86,27 @@ export default function Search() {
78
86
  placeholder={t('common.search.placeholder')}
79
87
  ref={inputRef}
80
88
  />
89
+
90
+ <PluginModule
91
+ component={Component.HeaderImageSearchFeature}
92
+ props={{
93
+ settings: {
94
+ customStyles: {
95
+ controlsInner: 'bg-red-500'
96
+ }
97
+ }
98
+ }}
99
+ />
100
+
81
101
  <Icon
82
102
  name="close"
83
103
  size={14}
84
- onClick={() => dispatch(closeSearch())}
104
+ onClick={handleCloseSearch}
85
105
  className="cursor-pointer"
86
106
  />
87
107
  </div>
88
108
  </div>
109
+
89
110
  <Results searchText={searchText} />
90
111
  </div>
91
112
  </div>
@@ -22,6 +22,16 @@ export default async function ProductLayout({
22
22
  breadcrumbData,
23
23
  children
24
24
  }: ProductPageProps) {
25
+ const categoryIds = breadcrumbData
26
+ ?.map((item) => item.extra_context?.attributes?.category_id)
27
+ .filter(Boolean)
28
+ .join(',');
29
+
30
+ const categoryPaths = breadcrumbData
31
+ ?.map((item) => item.path)
32
+ .filter(Boolean)
33
+ .join(',');
34
+
25
35
  return (
26
36
  <div className="container mx-auto">
27
37
  <div className="max-w-5xl mx-auto my-5 px-7">
@@ -31,7 +41,11 @@ export default async function ProductLayout({
31
41
  <div className="col-span-5 lg:col-span-3">
32
42
  <ProductInfoSlider product={data.product} />
33
43
  </div>
34
- <div className="flex flex-col items-center col-span-5 lg:col-span-2">
44
+ <div
45
+ className="flex flex-col items-center col-span-5 lg:col-span-2"
46
+ data-category-ids={categoryIds}
47
+ data-category-paths={categoryPaths}
48
+ >
35
49
  <div className="w-full">{children}</div>
36
50
  </div>
37
51
  </div>
@@ -13,6 +13,7 @@ import { useStockAlert } from '../../hooks/use-stock-alert';
13
13
  import { ProductVariants } from './product-variants';
14
14
  import { ProductActions } from './product-actions';
15
15
  import { ProductShare } from './product-share';
16
+ import PluginModule, { Component } from '@akinon/next/components/plugin-module';
16
17
 
17
18
  export default function ProductInfo({ data }: ProductPageProps) {
18
19
  const { data: session } = useSession();
@@ -105,6 +106,13 @@ export default function ProductInfo({ data }: ProductPageProps) {
105
106
  onCloseModal={closeModal}
106
107
  />
107
108
 
109
+ <PluginModule
110
+ component={Component.VirtualTryOnPlugin}
111
+ props={{
112
+ product: data.product
113
+ }}
114
+ />
115
+
108
116
  <MiscButtons
109
117
  productName={data.product.name}
110
118
  productPk={data.product.pk}
@@ -7,6 +7,7 @@ import { Product } from '@akinon/next/types';
7
7
  import { Image } from '@akinon/next/components/image';
8
8
  import useFavButton from '../../hooks/use-fav-button';
9
9
  import { twMerge } from 'tailwind-merge';
10
+ import PluginModule, { Component } from '@akinon/next/components/plugin-module';
10
11
 
11
12
  type ProductSliderItem = {
12
13
  product: Product;
@@ -35,90 +36,102 @@ export default function ProductInfoSlider({ product }: ProductSliderItem) {
35
36
  carouselRef.current?.next();
36
37
  };
37
38
 
38
- const handleThumbnailClick = (index) => {
39
+ const handleThumbnailClick = (index: number) => {
39
40
  setActiveIndex(index);
40
41
  carouselRef.current?.goToSlide(index);
41
42
  };
42
43
 
43
44
  return (
44
- <div className="lg:grid lg:grid-cols-6">
45
- <div className="lg:col-span-1">
46
- <div className="flex flex-col items-center justify-center md:mr-[6px]">
47
- <button
48
- onClick={goToPrev}
49
- className={twMerge(
50
- 'hidden justify-center p-2 mb-3 border border-gray-100 rounded-full cursor-pointer lg:block',
51
- [activeIndex === 0 && 'cursor-not-allowed opacity-45']
52
- )}
53
- disabled={activeIndex === 0}
45
+ <>
46
+ <div className="lg:grid lg:grid-cols-6">
47
+ <div className="lg:col-span-1">
48
+ <div className="flex flex-col items-center justify-center md:mr-[6px]">
49
+ <button
50
+ onClick={goToPrev}
51
+ className={twMerge(
52
+ 'hidden justify-center p-2 mb-3 border border-gray-100 rounded-full cursor-pointer lg:block',
53
+ [activeIndex === 0 && 'cursor-not-allowed opacity-45']
54
+ )}
55
+ disabled={activeIndex === 0}
56
+ >
57
+ <Icon name="chevron-up" size={15} className="fill-[#000000]" />
58
+ </button>
59
+ <div className="hidden flex-col items-center overflow-scroll w-[80px] max-h-[620px] lg:block">
60
+ {product?.productimage_set?.map((item, index) => (
61
+ <Image
62
+ key={index}
63
+ src={item.image}
64
+ alt={`Thumbnail ${index}`}
65
+ width={80}
66
+ height={128}
67
+ aspectRatio={80 / 128}
68
+ className={twMerge('cursor-pointer', [
69
+ activeIndex === index && 'border-2 border-primary'
70
+ ])}
71
+ onClick={() => handleThumbnailClick(index)}
72
+ />
73
+ ))}
74
+ </div>
75
+ <button
76
+ onClick={goToNext}
77
+ className={twMerge(
78
+ 'hidden justify-center p-2 mt-3 border border-gray-100 rounded-full cursor-pointer lg:block',
79
+ [
80
+ activeIndex === product.productimage_set.length - 1 &&
81
+ 'cursor-not-allowed opacity-45'
82
+ ]
83
+ )}
84
+ disabled={activeIndex === product.productimage_set.length - 1}
85
+ >
86
+ <Icon name="chevron-down" size={15} className="fill-[#000000]" />
87
+ </button>
88
+ </div>
89
+ </div>
90
+
91
+ <div className="relative lg:col-span-5">
92
+ <FavButton className="absolute right-8 top-6 z-[20] sm:hidden" />
93
+
94
+ <PluginModule
95
+ component={Component.ProductImageSearchFeature}
96
+ props={{
97
+ product,
98
+ activeIndex,
99
+ showResetButton: true
100
+ }}
101
+ />
102
+
103
+ <CarouselCore
104
+ responsive={{
105
+ all: {
106
+ breakpoint: { max: 5000, min: 0 },
107
+ items: 1
108
+ }
109
+ }}
110
+ arrows={false}
111
+ swipeable={true}
112
+ ref={carouselRef}
113
+ afterChange={(previousSlide, { currentSlide }) => {
114
+ setActiveIndex(currentSlide);
115
+ }}
116
+ containerAspectRatio={{ mobile: 520 / 798, desktop: 484 / 726 }}
54
117
  >
55
- <Icon name="chevron-up" size={15} className="fill-[#000000]" />
56
- </button>
57
- <div className="hidden flex-col items-center overflow-scroll w-[80px] max-h-[620px] lg:block">
58
- {product?.productimage_set?.map((item, index) => (
118
+ {product?.productimage_set?.map((item, i) => (
59
119
  <Image
60
- key={index}
120
+ key={i}
61
121
  src={item.image}
62
- alt={`Thumbnail ${index}`}
63
- width={80}
64
- height={128}
65
- className={twMerge('cursor-pointer', [
66
- activeIndex === index && 'border-2 border-primary'
67
- ])}
68
- onClick={() => handleThumbnailClick(index)}
122
+ alt={product?.name || 'Product image'}
123
+ draggable={false}
124
+ aspectRatio={484 / 726}
125
+ sizes="(min-width: 425px) 512px,
126
+ (min-width: 601px) 576px,
127
+ (min-width: 768px) 336px,
128
+ (min-width: 1024px) 484px, 368px"
129
+ fill
69
130
  />
70
131
  ))}
71
- </div>
72
- <button
73
- onClick={goToNext}
74
- className={twMerge(
75
- 'hidden justify-center p-2 mt-3 border border-gray-100 rounded-full cursor-pointer lg:block',
76
- [
77
- activeIndex === product.productimage_set.length - 1 &&
78
- 'cursor-not-allowed opacity-45'
79
- ]
80
- )}
81
- disabled={activeIndex === product.productimage_set.length - 1}
82
- >
83
- <Icon name="chevron-down" size={15} className="fill-[#000000]" />
84
- </button>
132
+ </CarouselCore>
85
133
  </div>
86
134
  </div>
87
-
88
- <div className="relative lg:col-span-5">
89
- <FavButton className="absolute right-8 top-6 z-[20] sm:hidden" />
90
-
91
- <CarouselCore
92
- responsive={{
93
- all: {
94
- breakpoint: { max: 5000, min: 0 },
95
- items: 1
96
- }
97
- }}
98
- arrows={false}
99
- swipeable={true}
100
- ref={carouselRef}
101
- afterChange={(previousSlide, { currentSlide }) => {
102
- setActiveIndex(currentSlide);
103
- }}
104
- containerAspectRatio={{ mobile: 520 / 798, desktop: 484 / 726 }}
105
- >
106
- {product?.productimage_set?.map((item, i) => (
107
- <Image
108
- key={i}
109
- src={item.image}
110
- alt={product.name}
111
- draggable={false}
112
- aspectRatio={484 / 726}
113
- sizes="(min-width: 425px) 512px,
114
- (min-width: 601px) 576px,
115
- (min-width: 768px) 336px,
116
- (min-width: 1024px) 484px, 368px"
117
- fill
118
- />
119
- ))}
120
- </CarouselCore>
121
- </div>
122
- </div>
135
+ </>
123
136
  );
124
137
  }
@@ -137,6 +137,10 @@ export default async () => {
137
137
  name: 'Tamara Payment Extension',
138
138
  value: 'pz-tamara-extension'
139
139
  },
140
+ {
141
+ name: 'Similar Products',
142
+ value: 'pz-similar-products'
143
+ },
140
144
  {
141
145
  name: 'Hepsipay',
142
146
  value: 'pz-hepsipay'
@@ -144,6 +148,14 @@ export default async () => {
144
148
  {
145
149
  name: 'Flow Payment',
146
150
  value: 'pz-flow-payment'
151
+ },
152
+ {
153
+ name: 'Virtual Try-On',
154
+ value: 'pz-virtual-try-on'
155
+ },
156
+ {
157
+ name: 'CyberSource UC',
158
+ value: 'pz-cybersource-uc'
147
159
  }
148
160
  ];
149
161
 
@@ -152,6 +152,10 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
152
152
  name: 'Tamara Payment Extension',
153
153
  value: 'pz-tamara-extension'
154
154
  },
155
+ {
156
+ name: 'Similar Products',
157
+ value: 'pz-similar-products'
158
+ },
155
159
  {
156
160
  name: 'Hepsipay',
157
161
  value: 'pz-hepsipay'
@@ -159,6 +163,14 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
159
163
  {
160
164
  name: 'Flow Payment',
161
165
  value: 'pz-flow-payment'
166
+ },
167
+ {
168
+ name: 'Virtual Try-On',
169
+ value: 'pz-virtual-try-on'
170
+ },
171
+ {
172
+ name: 'CyberSource UC',
173
+ value: 'pz-cybersource-uc'
162
174
  }
163
175
  ];
164
176
  try {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@akinon/projectzero",
3
- "version": "1.108.0",
3
+ "version": "1.109.0-rc.11",
4
4
  "private": false,
5
5
  "description": "CLI tool to manage your Project Zero Next project",
6
6
  "bin": {