x

apps/admin/src/components/page-builder/CustomBlockForm.tsx

@@ -89,7 +89,7 @@ export default function CustomBlockForm({
           defaultValue={formatProps(editingSection.payload?.props)}
           onChange={(e) => updateProps(e.target.value)}
           className="admin-input w-full resize-y font-mono text-sm"
-          placeholder={'{\n  "title": { "th": "หมวดหมู่เบเกอรี่", "en": "Bakery Categories" },\n  "subtitle": { "th": "เลือกซื้อขนมอบตามหมวดหมู่ที่คุณชอบ", "en": "Explore fresh-baked favorites by collection." },\n  "layout": "horizontal",\n  "items": []\n}'}
+          placeholder={'{\n  "title": { "th": "หมวดหมู่เบเกอรี่", "en": "Bakery Categories" },\n  "subtitle": { "th": "เลือกซื้อขนมอบตามหมวดหมู่ที่คุณชอบ", "en": "Explore fresh-baked favorites by collection." },\n  "layout": "horizontal",\n  "items": [\n    { "title": { "th": "ขนมไทย", "en": "Thai Dessert" }, "href": "/shop", "icon": "dessert" }\n  ]\n}'}
         />
         {jsonError && (
           <p className="text-xs font-semibold text-red-300">{jsonError}</p>

apps/admin/src/pages/PageBuilderPage.tsx

@@ -699,7 +699,8 @@ export default function PageBuilderPage() {
                   th: 'ขนมปังอบสดใหม่ทุกวัน',
                   en: 'Daily loaves, sourdough, and soft sandwich breads.'
                 },
-                href: '/shop'
+                href: '/shop',
+                icon: 'bakery'
               },
               {
                 title: { th: 'พาสทรี', en: 'Pastries' },
@@ -707,7 +708,8 @@ export default function PageBuilderPage() {
                   th: 'พาสทรีเนยหอมกรอบสำหรับมื้อเช้าและของฝาก',
                   en: 'Layered butter pastries for breakfast and gifting.'
                 },
-                href: '/shop'
+                href: '/shop',
+                icon: 'dessert'
               },
               {
                 title: { th: 'เค้ก', en: 'Cakes' },
@@ -715,7 +717,8 @@ export default function PageBuilderPage() {
                   th: 'เค้กสำหรับวันพิเศษและช่วงเวลาพักผ่อน',
                   en: 'Celebration cakes and slices for quiet afternoons.'
                 },
-                href: '/shop'
+                href: '/shop',
+                icon: 'cake'
               },
               {
                 title: { th: 'คุกกี้', en: 'Cookies' },
@@ -723,7 +726,8 @@ export default function PageBuilderPage() {
                   th: 'คุกกี้อบใหม่ กรอบนอกนุ่มใน',
                   en: 'Small-batch cookies with crisp edges and soft centers.'
                 },
-                href: '/shop'
+                href: '/shop',
+                icon: 'cookie'
               }
             ]
           }

apps/mcp-server/section-toolkit.ts

@@ -93,7 +93,7 @@ const ADD_PAGE_SECTION_GUIDANCE: Record<string, { required: string[]; example: s
   },
   CUSTOM: {
     required: ["componentId"],
-    example: `{ "componentId": "BakeryCategories", "props": { "title": ${localizedStringExample}, "subtitle": ${localizedStringExample}, "layout": "horizontal", "items": [{ "title": ${localizedStringExample}, "description": ${localizedStringExample}, "href": "/shop" }] } }`
+    example: `{ "componentId": "BakeryCategories", "props": { "title": ${localizedStringExample}, "subtitle": ${localizedStringExample}, "layout": "horizontal", "items": [{ "title": ${localizedStringExample}, "description": ${localizedStringExample}, "href": "/shop", "icon": "bakery" }] } }`
   }
 };
 

apps/spa/src/components/custom/BakeryCategories.tsx

@@ -1,5 +1,6 @@
 import { Link } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
+import { ArrowRight, CakeSlice, Cookie, Croissant, Gift, type LucideIcon } from 'lucide-react';
 import type { CustomBlockComponentProps } from '../../config/customRegistry';
 import { getLocalizedField } from '../../utils/localization';
 
@@ -10,6 +11,7 @@ type BakeryCategory = {
   description?: LocalizedValue;
   href: string;
   imageUrl?: string;
+  icon?: string;
 };
 
 type ResolvedBakeryCategory = {
@@ -17,6 +19,19 @@ type ResolvedBakeryCategory = {
   description: string;
   href: string;
   imageUrl?: string;
+  icon: string;
+};
+
+const iconMap: Record<string, LucideIcon> = {
+  bakery: Croissant,
+  bread: Croissant,
+  cake: CakeSlice,
+  cakes: CakeSlice,
+  dessert: Cookie,
+  cookie: Cookie,
+  cookies: Cookie,
+  gift: Gift,
+  gifts: Gift,
 };
 
 const defaultItems: BakeryCategory[] = [
@@ -24,21 +39,25 @@ const defaultItems: BakeryCategory[] = [
     title: 'Breads',
     description: 'Daily loaves, sourdough, and soft sandwich breads.',
     href: '/shop',
+    icon: 'bakery',
   },
   {
     title: 'Pastries',
     description: 'Layered butter pastries for breakfast and gifting.',
     href: '/shop',
+    icon: 'dessert',
   },
   {
     title: 'Cakes',
     description: 'Celebration cakes and slices for quiet afternoons.',
     href: '/shop',
+    icon: 'cake',
   },
   {
     title: 'Cookies',
     description: 'Small-batch cookies with crisp edges and soft centers.',
     href: '/shop',
+    icon: 'cookie',
   },
 ];
 
@@ -66,6 +85,7 @@ function readItems(value: unknown, lang: string): ResolvedBakeryCategory[] {
       description: readLocalized(record.description, lang, ''),
       href: readString(record.href, '/shop'),
       imageUrl: typeof record.imageUrl === 'string' ? record.imageUrl : undefined,
+      icon: readString(record.icon, 'bakery'),
     });
     return acc;
   }, []);
@@ -101,7 +121,7 @@ export default function BakeryCategories({ props }: CustomBlockComponentProps) {
               to={item.href}
               className="ui-shell-card ui-shell-card-hover group overflow-hidden"
             >
-              <div className="relative flex aspect-[4/3] items-center justify-center overflow-hidden bg-pop-black/5">
+              <div className="relative flex aspect-[16/9] items-center justify-center overflow-hidden bg-pop-black/5">
                 {item.imageUrl ? (
                   <img
                     src={item.imageUrl}
@@ -114,9 +134,18 @@ export default function BakeryCategories({ props }: CustomBlockComponentProps) {
                   </span>
                 )}
               </div>
-              <div className="space-y-3 p-6">
-                <h3 className="text-xl font-semibold text-pop-black">{item.title}</h3>
-                <p className="text-sm leading-relaxed text-pop-black/70">{item.description}</p>
+              <div className="relative flex min-h-20 items-end gap-4 px-5 pb-4 pt-7">
+                <div className="absolute -top-8 left-5 flex h-14 w-14 items-center justify-center rounded-full border border-pop-pink/30 bg-pop-bg text-pop-pink shadow-sm">
+                  {(() => {
+                    const Icon = iconMap[item.icon] ?? Croissant;
+                    return <Icon className="h-7 w-7" strokeWidth={1.7} />;
+                  })()}
+                </div>
+                <div className="min-w-0 flex-1">
+                  <h3 className="truncate text-lg font-semibold leading-tight text-pop-black">{item.title}</h3>
+                  <p className="truncate text-sm leading-tight text-pop-black/70">{item.description}</p>
+                </div>
+                <ArrowRight className="mb-2 h-4 w-4 shrink-0 text-pop-black transition group-hover:translate-x-1 group-hover:text-pop-pink" />
               </div>
             </Link>
           ))}

apps/website/src/components/custom/BakeryCategories.tsx

@@ -1,4 +1,5 @@
 import Image from 'next/image'
+import { ArrowRight, CakeSlice, Cookie, Croissant, Gift, type LucideIcon } from 'lucide-react'
 import Link from '../LocalizedLink'
 import type { CustomBlockComponentProps } from '../../config/customRegistry'
 import { resolveLocalized } from '../../lib/localization'
@@ -10,6 +11,7 @@ type BakeryCategory = {
   description?: LocalizedValue
   href: string
   imageUrl?: string
+  icon?: string
 }
 
 type ResolvedBakeryCategory = {
@@ -17,6 +19,19 @@ type ResolvedBakeryCategory = {
   description: string
   href: string
   imageUrl?: string
+  icon: string
+}
+
+const iconMap: Record<string, LucideIcon> = {
+  bakery: Croissant,
+  bread: Croissant,
+  cake: CakeSlice,
+  cakes: CakeSlice,
+  dessert: Cookie,
+  cookie: Cookie,
+  cookies: Cookie,
+  gift: Gift,
+  gifts: Gift,
 }
 
 const defaultItems: BakeryCategory[] = [
@@ -24,21 +39,25 @@ const defaultItems: BakeryCategory[] = [
     title: 'Breads',
     description: 'Daily loaves, sourdough, and soft sandwich breads.',
     href: '/shop',
+    icon: 'bakery',
   },
   {
     title: 'Pastries',
     description: 'Layered butter pastries for breakfast and gifting.',
     href: '/shop',
+    icon: 'dessert',
   },
   {
     title: 'Cakes',
     description: 'Celebration cakes and slices for quiet afternoons.',
     href: '/shop',
+    icon: 'cake',
   },
   {
     title: 'Cookies',
     description: 'Small-batch cookies with crisp edges and soft centers.',
     href: '/shop',
+    icon: 'cookie',
   },
 ]
 
@@ -66,6 +85,7 @@ function readItems(value: unknown, lang: string): ResolvedBakeryCategory[] {
       description: readLocalized(record.description, lang, ''),
       href: readString(record.href, '/shop'),
       imageUrl: typeof record.imageUrl === 'string' ? record.imageUrl : undefined,
+      icon: readString(record.icon, 'bakery'),
     })
     return acc
   }, [])
@@ -97,7 +117,7 @@ export default function BakeryCategories({ props, lang }: CustomBlockComponentPr
               href={item.href}
               className="group overflow-hidden rounded-2xl border border-line-primary/20 bg-surface-card shadow-card transition hover:-translate-y-1 hover:shadow-card-hover"
             >
-              <div className="relative flex aspect-[4/3] items-center justify-center overflow-hidden bg-surface-muted">
+              <div className="relative flex aspect-[16/9] items-center justify-center overflow-hidden bg-surface-muted">
                 {item.imageUrl ? (
                   <Image
                     src={item.imageUrl}
@@ -112,9 +132,18 @@ export default function BakeryCategories({ props, lang }: CustomBlockComponentPr
                   </span>
                 )}
               </div>
-              <div className="space-y-3 p-6">
-                <h3 className="text-xl font-semibold text-text-main">{item.title}</h3>
-                <p className="text-sm leading-relaxed text-muted-text">{item.description}</p>
+              <div className="relative flex min-h-20 items-end gap-4 px-5 pb-4 pt-7">
+                <div className="absolute -top-8 left-5 flex h-14 w-14 items-center justify-center rounded-full border border-brand-primary/30 bg-surface-card text-brand-primary shadow-card">
+                  {(() => {
+                    const Icon = iconMap[item.icon] ?? Croissant
+                    return <Icon className="h-7 w-7" strokeWidth={1.7} />
+                  })()}
+                </div>
+                <div className="min-w-0 flex-1">
+                  <h3 className="truncate text-lg font-semibold leading-tight text-text-main">{item.title}</h3>
+                  <p className="truncate text-sm leading-tight text-muted-text">{item.description}</p>
+                </div>
+                <ArrowRight className="mb-2 h-4 w-4 shrink-0 text-text-main transition group-hover:translate-x-1 group-hover:text-brand-primary" />
               </div>
             </Link>
           ))}