@evershop/evershop 2.1.0 → 2.1.2

package/dist/modules/catalog/pages/admin/productEdit+productNew/Attributes.js

@@ -1,7 +1,9 @@
-import { Card } from '@components/admin/Card.js';
 import { InputField } from '@components/common/form/InputField.js';
+import { ReactSelectField } from '@components/common/form/ReactSelectField.js';
 import { SelectField } from '@components/common/form/SelectField.js';
 import { TextareaField } from '@components/common/form/TextareaField.js';
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@components/common/ui/Card.js';
+import { Table, TableBody, TableCell, TableRow } from '@components/common/ui/Table.js';
 import { _ } from '@evershop/evershop/lib/locale/translate/_';
 import React, { useEffect } from 'react';
 import { useFieldArray, useFormContext } from 'react-hook-form';
@@ -34,7 +36,7 @@ const getAttributeSelectedValues = (attributeIndex, attributeId, attributeType)
 export default function Attributes({ product, groups: { items } }) {
     var _a;
     const { unregister, watch } = useFormContext();
-    const { fields, replace } = useFieldArray({
+    const { fields, remove, append } = useFieldArray({
         name: 'attributes'
     });
     const attributeIndex = (product === null || product === void 0 ? void 0 : product.attributeIndex) || [];
@@ -42,6 +44,13 @@ export default function Attributes({ product, groups: { items } }) {
     useEffect(() => {
         var _a;
         if (currentGroup) {
+            // Unregister all existing attribute fields
+            fields.forEach((_, index) => {
+                unregister(`attributes.${index}`);
+            });
+            // Remove all existing fields
+            remove();
+            // Get new attributes for the selected group
             const attributes = ((_a = getGroup(items, currentGroup)) === null || _a === void 0 ? void 0 : _a.attributes.items) || [];
             const newFields = attributes.map((attribute) => ({
                 attribute_code: attribute.attribute_code,
@@ -51,24 +60,28 @@ export default function Attributes({ product, groups: { items } }) {
                 value: getAttributeSelectedValues(attributeIndex, attribute.attribute_id, attribute.type),
                 is_required: attribute.is_required
             }));
-            replace(newFields);
+            // Append new fields
+            append(newFields);
         }
-    }, [currentGroup, items, replace, unregister]);
+    }, [currentGroup, items, append, remove, unregister]);
     return (React.createElement(Card, null,
-        React.createElement(Card.Session, { title: "Attribute group" },
+        React.createElement(CardHeader, null,
+            React.createElement(CardTitle, null, "Attribute group"),
+            React.createElement(CardDescription, null, "Manage the attributes.")),
+        React.createElement(CardContent, null,
             React.createElement("div", null,
-                (product === null || product === void 0 ? void 0 : product.variantGroupId) && (React.createElement("div", null,
+                (product === null || product === void 0 ? void 0 : product.variantGroupId) && (React.createElement("div", { className: "flex flex-col" },
                     React.createElement(InputField, { type: "hidden", defaultValue: product === null || product === void 0 ? void 0 : product.groupId, name: "group_id" }),
-                    React.createElement("div", { className: "border rounded border-divider p-2" },
-                        React.createElement("span", null, getGroup(items, product === null || product === void 0 ? void 0 : product.groupId).groupName)),
-                    React.createElement("div", { className: "italic text-textSubdued" }, "Can not change the attribute group of a product that is already in a variant group."))),
+                    React.createElement("div", null,
+                        React.createElement("span", { className: "font-semibold" }, getGroup(items, product === null || product === void 0 ? void 0 : product.groupId).groupName),
+                        React.createElement("p", { className: "text-muted-foreground italic" }, "Can not change the attribute group of a product that is already in a variant group.")))),
                 !(product === null || product === void 0 ? void 0 : product.variantGroupId) && (React.createElement(SelectField, { name: "group_id", label: "Attribute group", options: items.map((group) => ({
                         value: group.groupId,
                         label: group.groupName
-                    })), defaultValue: product === null || product === void 0 ? void 0 : product.groupId, required: true })))),
-        React.createElement(Card.Session, { title: "Attributes" },
-            React.createElement("table", { className: "table table-auto" },
-                React.createElement("tbody", null, fields.map((attribute, index) => {
+                    })), defaultValue: (product === null || product === void 0 ? void 0 : product.groupId) || currentGroup, required: true })))),
+        React.createElement(CardContent, null,
+            React.createElement(Table, null,
+                React.createElement(TableBody, null, fields.map((attribute, index) => {
                     const validation = attribute.is_required === 1
                         ? {
                             required: `${attribute.attribute_name} is required`
@@ -86,7 +99,7 @@ export default function Attributes({ product, groups: { items } }) {
                             Field = (React.createElement(SelectField, { name: `attributes.${index}.value`, options: getAttributeOptions(items, attribute.attribute_id), placeholder: "Select an option", validation: validation }));
                             break;
                         case 'multiselect':
-                            Field = (React.createElement(SelectField, { name: `attributes.${index}.value`, options: getAttributeOptions(items, attribute.attribute_id), placeholder: "Select options", required: attribute.is_required === 1, validation: validation, multiple: true }));
+                            Field = (React.createElement(ReactSelectField, { name: `attributes.${index}.value`, options: getAttributeOptions(items, attribute.attribute_id), placeholder: "Select options", required: attribute.is_required === 1, validation: validation, isMulti: true }));
                             break;
                         default:
                             Field = (React.createElement(InputField, { name: `attributes.${index}.value`, required: attribute.is_required === 1, validation: validation, placeholder: _('Enter value for ${attribute}', {
@@ -94,11 +107,11 @@ export default function Attributes({ product, groups: { items } }) {
                                 }) }));
                             break;
                     }
-                    return (React.createElement("tr", { key: attribute.id },
-                        React.createElement("td", null,
+                    return (React.createElement(TableRow, { key: attribute.id },
+                        React.createElement(TableCell, null,
                             React.createElement("span", null, attribute.attribute_name),
-                            attribute.is_required === 1 && (React.createElement("span", { className: "required-indicator" }, "*"))),
-                        React.createElement("td", null,
+                            attribute.is_required === 1 && (React.createElement("span", { className: "text-destructive pl-1" }, "*"))),
+                        React.createElement(TableCell, null,
                             React.createElement(InputField, { type: "hidden", value: attribute.attribute_code, name: `attributes.${index}.attribute_code` }),
                             Field)));
                 }))))));

package/dist/modules/catalog/pages/admin/productEdit+productNew/Attributes.js.map

@@ -1 +1 @@
-{"version":3,"file":"Attributes.js","sourceRoot":"","sources":["../../../../../../src/modules/catalog/pages/admin/productEdit+productNew/Attributes.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"Attributes.js","sourceRoot":"","sources":["../../../../../../src/modules/catalog/pages/admin/productEdit+productNew/Attributes.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,6CAA6C,CAAC;AAC/E,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAC;AACzE,OAAO,EACL,IAAI,EACJ,WAAW,EACX,eAAe,EACf,UAAU,EACV,SAAS,EACV,MAAM,+BAA+B,CAAC;AAOvC,OAAO,EACL,KAAK,EACL,SAAS,EACT,SAAS,EACT,QAAQ,EACT,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,CAAC,EAAE,MAAM,2CAA2C,CAAC;AAC9D,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAuBhE,MAAM,QAAQ,GAAG,CAAC,SAAkB,EAAE,EAAE,OAA2B,EAAE,EAAE,CACrE,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,KAAK,OAAO,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC;AAEjE,MAAM,mBAAmB,GAAG,CAAC,MAAe,EAAE,WAAmB,EAAE,EAAE;;IACnE,MAAM,SAAS,GAAG,MAAA,MAAM;SACrB,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CACd,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,KAAK,WAAW,CAAC,CACzE,0CACC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,KAAK,WAAW,CAAC,CAAC;IACvE,OAAO,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;AAC5C,CAAC,CAAC;AAEF,MAAM,0BAA0B,GAAG,CACjC,cAAc,EACd,WAAW,EACX,aAAa,EACb,EAAE;;IACF,QAAQ,aAAa,EAAE,CAAC;QACtB,KAAK,MAAM,CAAC;QACZ,KAAK,UAAU,CAAC;QAChB,KAAK,MAAM,CAAC;QACZ,KAAK,UAAU;YACb,OAAO,CACL,CAAA,MAAA,cAAc,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,WAAW,KAAK,WAAW,CAAC,0CACzD,UAAU,KAAI,EAAE,CACrB,CAAC;QACJ,KAAK,QAAQ;YACX,OAAO,CACL,CAAA,MAAA,cAAc;iBACX,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,WAAW,KAAK,WAAW,CAAC,0CAC7C,QAAQ,CAAC,QAAQ,EAAE,KAAI,EAAE,CAC9B,CAAC;QACJ,KAAK,aAAa;YAChB,OAAO,cAAc;iBAClB,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,WAAW,KAAK,WAAW,CAAC;iBAChD,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC3C;YACE,OAAO,EAAE,CAAC;IACd,CAAC;AACH,CAAC,CAAC;AAqBF,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EACjC,OAAO,EACP,MAAM,EAAE,EAAE,KAAK,EAAE,EACD;;IAChB,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,cAAc,EAAE,CAAC;IAC/C,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,aAAa,CAAa;QAC3D,IAAI,EAAE,YAAY;KACnB,CAAC,CAAC;IACH,MAAM,cAAc,GAAG,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,cAAc,KAAI,EAAE,CAAC;IACrD,MAAM,YAAY,GAAG,KAAK,CACxB,UAAU,EACV,CAAA,MAAA,QAAQ,CAAC,KAAK,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,0CAAE,OAAO,KAAI,SAAS,CACxD,CAAC;IACF,SAAS,CAAC,GAAG,EAAE;;QACb,IAAI,YAAY,EAAE,CAAC;YACjB,2CAA2C;YAC3C,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;gBAC1B,UAAU,CAAC,cAAc,KAAK,EAAE,CAAC,CAAC;YACpC,CAAC,CAAC,CAAC;YAEH,6BAA6B;YAC7B,MAAM,EAAE,CAAC;YAET,4CAA4C;YAC5C,MAAM,UAAU,GAAG,CAAA,MAAA,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC,0CAAE,UAAU,CAAC,KAAK,KAAI,EAAE,CAAC;YACzE,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;gBAC/C,cAAc,EAAE,SAAS,CAAC,cAAc;gBACxC,cAAc,EAAE,SAAS,CAAC,cAAc;gBACxC,IAAI,EAAE,SAAS,CAAC,IAAI;gBACpB,YAAY,EAAE,SAAS,CAAC,YAAY;gBACpC,KAAK,EAAE,0BAA0B,CAC/B,cAAc,EACd,SAAS,CAAC,YAAY,EACtB,SAAS,CAAC,IAAI,CACf;gBACD,WAAW,EAAE,SAAS,CAAC,WAAW;aACnC,CAAC,CAAC,CAAC;YAEJ,oBAAoB;YACpB,MAAM,CAAC,SAAS,CAAC,CAAC;QACpB,CAAC;IACH,CAAC,EAAE,CAAC,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC;IAEtD,OAAO,CACL,oBAAC,IAAI;QACH,oBAAC,UAAU;YACT,oBAAC,SAAS,0BAA4B;YACtC,oBAAC,eAAe,iCAAyC,CAC9C;QACb,oBAAC,WAAW;YACV;gBACG,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,cAAc,KAAI,CAC1B,6BAAK,SAAS,EAAC,eAAe;oBAC5B,oBAAC,UAAU,IACT,IAAI,EAAC,QAAQ,EACb,YAAY,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,EAC9B,IAAI,EAAC,UAAU,GACf;oBACF;wBACE,8BAAM,SAAS,EAAC,eAAe,IAC5B,QAAQ,CAAC,KAAK,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC,SAAS,CACvC;wBACP,2BAAG,SAAS,EAAC,8BAA8B,0FAGvC,CACA,CACF,CACP;gBACA,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,cAAc,CAAA,IAAI,CAC3B,oBAAC,WAAW,IACV,IAAI,EAAC,UAAU,EACf,KAAK,EAAC,iBAAiB,EACvB,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;wBAC7B,KAAK,EAAE,KAAK,CAAC,OAAO;wBACpB,KAAK,EAAE,KAAK,CAAC,SAAS;qBACvB,CAAC,CAAC,EACH,YAAY,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,KAAI,YAAY,EAC9C,QAAQ,SACR,CACH,CACG,CACM;QACd,oBAAC,WAAW;YACV,oBAAC,KAAK;gBACJ,oBAAC,SAAS,QACP,MAAM,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE;oBAC/B,MAAM,UAAU,GACd,SAAS,CAAC,WAAW,KAAK,CAAC;wBACzB,CAAC,CAAC;4BACE,QAAQ,EAAE,GAAG,SAAS,CAAC,cAAc,cAAc;yBACpD;wBACH,CAAC,CAAC,EAAE,CAAC;oBACT,IAAI,KAAK,GAAoB,IAAI,CAAC;oBAClC,QAAQ,SAAS,CAAC,IAAI,EAAE,CAAC;wBACvB,KAAK,MAAM;4BACT,KAAK,GAAG,CACN,oBAAC,UAAU,IACT,IAAI,EAAE,cAAc,KAAK,QAAQ,EACjC,QAAQ,EAAE,SAAS,CAAC,WAAW,KAAK,CAAC,EACrC,UAAU,EAAE,UAAU,GACtB,CACH,CAAC;4BACF,MAAM;wBACR,KAAK,UAAU;4BACb,KAAK,GAAG,CACN,oBAAC,aAAa,IACZ,IAAI,EAAE,cAAc,KAAK,QAAQ,EACjC,QAAQ,EAAE,SAAS,CAAC,WAAW,KAAK,CAAC,EACrC,UAAU,EAAE,UAAU,GACtB,CACH,CAAC;4BACF,MAAM;wBACR,KAAK,QAAQ;4BACX,KAAK,GAAG,CACN,oBAAC,WAAW,IACV,IAAI,EAAE,cAAc,KAAK,QAAQ,EACjC,OAAO,EAAE,mBAAmB,CAC1B,KAAK,EACL,SAAS,CAAC,YAAY,CACvB,EACD,WAAW,EAAC,kBAAkB,EAC9B,UAAU,EAAE,UAAU,GACtB,CACH,CAAC;4BACF,MAAM;wBACR,KAAK,aAAa;4BAChB,KAAK,GAAG,CACN,oBAAC,gBAAgB,IACf,IAAI,EAAE,cAAc,KAAK,QAAQ,EACjC,OAAO,EAAE,mBAAmB,CAC1B,KAAK,EACL,SAAS,CAAC,YAAY,CACvB,EACD,WAAW,EAAC,gBAAgB,EAC5B,QAAQ,EAAE,SAAS,CAAC,WAAW,KAAK,CAAC,EACrC,UAAU,EAAE,UAAU,EACtB,OAAO,SACP,CACH,CAAC;4BACF,MAAM;wBACR;4BACE,KAAK,GAAG,CACN,oBAAC,UAAU,IACT,IAAI,EAAE,cAAc,KAAK,QAAQ,EACjC,QAAQ,EAAE,SAAS,CAAC,WAAW,KAAK,CAAC,EACrC,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,CAAC,CAAC,8BAA8B,EAAE;oCAC7C,SAAS,EAAE,SAAS,CAAC,cAAc;iCACpC,CAAC,GACF,CACH,CAAC;4BACF,MAAM;oBACV,CAAC;oBACD,OAAO,CACL,oBAAC,QAAQ,IAAC,GAAG,EAAE,SAAS,CAAC,EAAE;wBACzB,oBAAC,SAAS;4BACR,kCAAO,SAAS,CAAC,cAAc,CAAQ;4BACtC,SAAS,CAAC,WAAW,KAAK,CAAC,IAAI,CAC9B,8BAAM,SAAS,EAAC,uBAAuB,QAAS,CACjD,CACS;wBACZ,oBAAC,SAAS;4BACR,oBAAC,UAAU,IACT,IAAI,EAAC,QAAQ,EACb,KAAK,EAAE,SAAS,CAAC,cAAc,EAC/B,IAAI,EAAE,cAAc,KAAK,iBAAiB,GAC1C;4BACD,KAAK,CACI,CACH,CACZ,CAAC;gBACJ,CAAC,CAAC,CACQ,CACN,CACI,CACT,CACR,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,WAAW;IACnB,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+BpB,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG;;;EAGvB,CAAC"}

package/dist/modules/catalog/pages/admin/productEdit+productNew/General.js

@@ -1,22 +1,22 @@
-import { Card } from '@components/admin/Card.js';
 import { CategorySelector } from '@components/admin/CategorySelector.js';
 import Area from '@components/common/Area.js';
 import { Editor } from '@components/common/form/Editor.js';
 import { InputField } from '@components/common/form/InputField.js';
 import { NumberField } from '@components/common/form/NumberField.js';
 import { SelectField } from '@components/common/form/SelectField.js';
-import { Modal } from '@components/common/modal/Modal.js';
-import { useModal } from '@components/common/modal/useModal.js';
+import { Button } from '@components/common/ui/Button.js';
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@components/common/ui/Card.js';
+import { Dialog, DialogContent, DialogHeader, DialogTitle } from '@components/common/ui/Dialog.js';
+import { Label } from '@components/common/ui/Label.js';
 import { _ } from '@evershop/evershop/lib/locale/translate/_';
 import React from 'react';
 import { useQuery } from 'urql';
 import './General.scss';
 import { useFormContext } from 'react-hook-form';
-const SKUPriceWeight = ({ sku, price, weight, setting }) => {
-    return (React.createElement("div", { className: "grid grid-cols-3 gap-2 mt-4" },
+const SKUAndPrice = ({ sku, price, setting }) => {
+    return (React.createElement("div", { className: "grid grid-cols-2 gap-2" },
         React.createElement(InputField, { name: "sku", label: "SKU", placeholder: "Enter SKU", defaultValue: sku, required: true, helperText: _('SKU must be unique') }),
-        React.createElement(NumberField, { name: "price", placeholder: "Enter price", label: `Price`, defaultValue: price === null || price === void 0 ? void 0 : price.value, unit: setting.storeCurrency, min: 0, required: true }),
-        React.createElement(NumberField, { name: "weight", placeholder: "Enter weight", label: `Weight`, defaultValue: weight === null || weight === void 0 ? void 0 : weight.value, unit: setting.weightUnit, required: true, validation: { min: 1 }, helperText: _('Weight must be a positive number') })));
+        React.createElement(NumberField, { name: "price", placeholder: "Enter price", label: `Price`, defaultValue: price === null || price === void 0 ? void 0 : price.value, unit: setting.storeCurrency, min: 0, required: true })));
 };
 const CategoryQuery = `
   query Query ($id: Int!) {
@@ -39,7 +39,7 @@ const ProductCategory = ({ categoryId, onChange, onUnassign }) => {
     });
     const { data, fetching, error } = result;
     if (error) {
-        return (React.createElement("p", { className: "text-critical" },
+        return (React.createElement("p", { className: "text-destructive" },
             "There was an error fetching categories.",
             error.message));
     }
@@ -58,31 +58,44 @@ const ProductCategory = ({ categoryId, onChange, onUnassign }) => {
             React.createElement("a", { href: "#", onClick: (e) => {
                     e.preventDefault();
                     onUnassign();
-                }, className: "text-critical ml-5" }, "Unassign")),
+                }, className: "text-destructive ml-5" }, "Unassign")),
         React.createElement("input", { type: "hidden", ...register('category_id'), value: categoryId })));
 };
 const CategorySelect = ({ product }) => {
+    const { setValue } = useFormContext();
     const [category, setCategory] = React.useState(product ? product.category : null);
-    const modal = useModal();
+    const [dialogOpen, setDialogOpen] = React.useState(false);
     const onSelect = (categoryId) => {
         setCategory({ categoryId });
-        modal.close();
+        setValue('category_id', categoryId || '');
+        setDialogOpen(false);
     };
-    return (React.createElement("div", { className: "mt-4 relative" },
-        React.createElement("div", { className: "mb-2" }, "Category"),
-        category && (React.createElement("div", { className: "border rounded border-[#c9cccf] mb-2 p-2" },
-            React.createElement(ProductCategory, { categoryId: category.categoryId, onChange: () => modal.open(), onUnassign: () => setCategory(null) }))),
-        !category && (React.createElement("a", { href: "#", onClick: (e) => {
-                e.preventDefault();
-                modal.open();
-            }, className: "text-interactive" }, "Select category")),
-        React.createElement(Modal, { title: "Select Category", isOpen: modal.isOpen, onClose: modal.close },
-            React.createElement(CategorySelector, { onSelect: onSelect, onUnSelect: () => { }, selectedCategories: category ? [category] : [] }))));
+    return (React.createElement(Dialog, { open: dialogOpen, onOpenChange: setDialogOpen },
+        React.createElement("div", { className: "space-y-3" },
+            React.createElement(Label, null, "Category"),
+            category && (React.createElement("div", { className: "border rounded border-border p-2" },
+                React.createElement(ProductCategory, { categoryId: category.categoryId, onChange: () => {
+                        setDialogOpen(true);
+                    }, onUnassign: () => {
+                        setCategory(null);
+                        setValue('category_id', '');
+                    } }))),
+            !category && (React.createElement(Button, { variant: "outline", size: "sm", onClick: (e) => {
+                    e.preventDefault();
+                    setDialogOpen(true);
+                } }, "Select category")),
+            React.createElement(DialogContent, null,
+                React.createElement(DialogHeader, null,
+                    React.createElement(DialogTitle, null, "Select Category")),
+                React.createElement(CategorySelector, { onSelect: onSelect, onUnSelect: () => { }, selectedCategories: category ? [category] : [] })))));
 };
 export default function General({ product, setting, productTaxClasses: { items: taxClasses } }) {
-    return (React.createElement(Card, { title: "General" },
-        React.createElement(Card.Session, null,
-            React.createElement(Area, { id: "productEditGeneral", coreComponents: [
+    return (React.createElement(Card, null,
+        React.createElement(CardHeader, null,
+            React.createElement(CardTitle, null, "General Information"),
+            React.createElement(CardDescription, null, "Manage the general information of the product.")),
+        React.createElement(CardContent, null,
+            React.createElement(Area, { id: "productEditGeneral", className: "flex flex-col gap-2", coreComponents: [
                     {
                         component: {
                             default: (React.createElement(InputField, { name: "name", placeholder: "Enter product name", label: "Product Name", defaultValue: product === null || product === void 0 ? void 0 : product.name, required: true, helperText: _('Product name is required') }))
@@ -92,12 +105,12 @@ export default function General({ product, setting, productTaxClasses: { items:
                     },
                     {
                         component: {
-                            default: (React.createElement(SKUPriceWeight, { sku: (product === null || product === void 0 ? void 0 : product.sku) || '', price: (product === null || product === void 0 ? void 0 : product.price.regular) || {
+                            default: (React.createElement(SKUAndPrice, { sku: (product === null || product === void 0 ? void 0 : product.sku) || '', price: (product === null || product === void 0 ? void 0 : product.price.regular) || {
                                     value: undefined
-                                }, weight: (product === null || product === void 0 ? void 0 : product.weight) || { value: undefined }, setting: setting }))
+                                }, setting: setting }))
                         },
                         sortOrder: 20,
-                        id: 'SKUPriceWeight'
+                        id: 'SKUAndPrice'
                     },
                     {
                         component: {

package/dist/modules/catalog/pages/admin/productEdit+productNew/General.js.map

@@ -1 +1 @@
-{"version":3,"file":"General.js","sourceRoot":"","sources":["../../../../../../src/modules/catalog/pages/admin/productEdit+productNew/General.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"General.js","sourceRoot":"","sources":["../../../../../../src/modules/catalog/pages/admin/productEdit+productNew/General.tsx"],"names":[],"mappings":"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"}

package/dist/modules/catalog/pages/admin/productEdit+productNew/General.scss

@@ -1,7 +1,10 @@
-.page-heading {
-  max-width: 62.5rem;
-}
-.main-content-inner {
-  max-width: 62.5rem;
-  margin: 1.875rem auto;
+body.productEdit,
+body.productNew {
+  .main-content-inner {
+    max-width: 62.5rem;
+    margin: 1.875rem auto;
+  }
+  .page-heading {
+    max-width: 62.5rem;
+  }
 }

package/dist/modules/catalog/pages/admin/productEdit+productNew/Inventory.js

@@ -1,6 +1,6 @@
-import { Card } from '@components/admin/Card.js';
 import { NumberField } from '@components/common/form/NumberField.js';
 import { RadioGroupField } from '@components/common/form/RadioGroupField.js';
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@components/common/ui/Card.js';
 import React from 'react';
 export default function Inventory({ product }) {
     const inventory = (product === null || product === void 0 ? void 0 : product.inventory) || {
@@ -8,18 +8,21 @@ export default function Inventory({ product }) {
         stockAvailability: undefined,
         manageStock: undefined
     };
-    return (React.createElement(Card, { title: "Inventory", subdued: true },
-        React.createElement(Card.Session, null,
+    return (React.createElement(Card, { className: "bg-popover" },
+        React.createElement(CardHeader, null,
+            React.createElement(CardTitle, null, "Inventory"),
+            React.createElement(CardDescription, null, "Manage the inventory settings of the product.")),
+        React.createElement(CardContent, null,
             React.createElement(RadioGroupField, { name: "manage_stock", label: "Manage Stock", options: [
                     { value: 1, label: 'Yes' },
                     { value: 0, label: 'No' }
                 ], defaultValue: inventory.manageStock === 0 ? 0 : 1, required: true })),
-        React.createElement(Card.Session, null,
+        React.createElement(CardContent, { className: "border-t border-t-border pt-6" },
             React.createElement(RadioGroupField, { name: "stock_availability", label: "Stock Availability", options: [
                     { value: 1, label: 'In Stock' },
                     { value: 0, label: 'Out of Stock' }
                 ], defaultValue: inventory.stockAvailability === 0 ? 0 : 1, required: true })),
-        React.createElement(Card.Session, null,
+        React.createElement(CardContent, { className: "border-t border-t-border pt-6" },
             React.createElement(NumberField, { name: "qty", defaultValue: inventory.qty, placeholder: "Quantity", label: "Quantity", required: true }))));
 }
 export const layout = {

package/dist/modules/catalog/pages/admin/productEdit+productNew/Inventory.js.map

@@ -1 +1 @@
-{"version":3,"file":"Inventory.js","sourceRoot":"","sources":["../../../../../../src/modules/catalog/pages/admin/productEdit+productNew/Inventory.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAC7E,OAAO,KAAK,MAAM,OAAO,CAAC;AAa1B,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,EAAE,OAAO,EAAkB;IAC3D,MAAM,SAAS,GAAG,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,SAAS,KAAI;QACtC,GAAG,EAAE,SAAS;QACd,iBAAiB,EAAE,SAAS;QAC5B,WAAW,EAAE,SAAS;KACvB,CAAC;IACF,OAAO,CACL,oBAAC,IAAI,IAAC,KAAK,EAAC,WAAW,EAAC,OAAO;QAC7B,oBAAC,IAAI,CAAC,OAAO;YACX,oBAAC,eAAe,IACd,IAAI,EAAC,cAAc,EACnB,KAAK,EAAC,cAAc,EACpB,OAAO,EAAE;oBACP,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE;oBAC1B,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE;iBAC1B,EACD,YAAY,EAAE,SAAS,CAAC,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EACjD,QAAQ,SACR,CACW;QACf,oBAAC,IAAI,CAAC,OAAO;YACX,oBAAC,eAAe,IACd,IAAI,EAAC,oBAAoB,EACzB,KAAK,EAAC,oBAAoB,EAC1B,OAAO,EAAE;oBACP,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE;oBAC/B,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE;iBACpC,EACD,YAAY,EAAE,SAAS,CAAC,iBAAiB,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EACvD,QAAQ,SACR,CACW;QACf,oBAAC,IAAI,CAAC,OAAO;YACX,oBAAC,WAAW,IACV,IAAI,EAAC,KAAK,EACV,YAAY,EAAE,SAAS,CAAC,GAAG,EAC3B,WAAW,EAAC,UAAU,EACtB,KAAK,EAAC,UAAU,EAChB,QAAQ,SACR,CACW,CACV,CACR,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,WAAW;IACnB,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;;;;;;;CAUpB,CAAC"}
+{"version":3,"file":"Inventory.js","sourceRoot":"","sources":["../../../../../../src/modules/catalog/pages/admin/productEdit+productNew/Inventory.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAC7E,OAAO,EACL,IAAI,EACJ,WAAW,EACX,eAAe,EACf,UAAU,EACV,SAAS,EACV,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,MAAM,OAAO,CAAC;AAa1B,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,EAAE,OAAO,EAAkB;IAC3D,MAAM,SAAS,GAAG,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,SAAS,KAAI;QACtC,GAAG,EAAE,SAAS;QACd,iBAAiB,EAAE,SAAS;QAC5B,WAAW,EAAE,SAAS;KACvB,CAAC;IACF,OAAO,CACL,oBAAC,IAAI,IAAC,SAAS,EAAC,YAAY;QAC1B,oBAAC,UAAU;YACT,oBAAC,SAAS,oBAAsB;YAChC,oBAAC,eAAe,wDAEE,CACP;QACb,oBAAC,WAAW;YACV,oBAAC,eAAe,IACd,IAAI,EAAC,cAAc,EACnB,KAAK,EAAC,cAAc,EACpB,OAAO,EAAE;oBACP,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE;oBAC1B,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE;iBAC1B,EACD,YAAY,EAAE,SAAS,CAAC,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EACjD,QAAQ,SACR,CACU;QACd,oBAAC,WAAW,IAAC,SAAS,EAAC,+BAA+B;YACpD,oBAAC,eAAe,IACd,IAAI,EAAC,oBAAoB,EACzB,KAAK,EAAC,oBAAoB,EAC1B,OAAO,EAAE;oBACP,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE;oBAC/B,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE;iBACpC,EACD,YAAY,EAAE,SAAS,CAAC,iBAAiB,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EACvD,QAAQ,SACR,CACU;QACd,oBAAC,WAAW,IAAC,SAAS,EAAC,+BAA+B;YACpD,oBAAC,WAAW,IACV,IAAI,EAAC,KAAK,EACV,YAAY,EAAE,SAAS,CAAC,GAAG,EAC3B,WAAW,EAAC,UAAU,EACtB,KAAK,EAAC,UAAU,EAChB,QAAQ,SACR,CACU,CACT,CACR,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,WAAW;IACnB,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;;;;;;;CAUpB,CAAC"}

package/dist/modules/catalog/pages/admin/productEdit+productNew/Media.js

@@ -1,5 +1,5 @@
-import { Card } from '@components/admin/Card.js';
 import { ImageUploader } from '@components/admin/ImageUploader.js';
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@components/common/ui/Card.js';
 import React, { useEffect } from 'react';
 import { useFieldArray, useFormContext } from 'react-hook-form';
 export default function Media({ product }) {
@@ -15,7 +15,10 @@ export default function Media({ product }) {
         replace(images);
     }, []);
     return (React.createElement(Card, { title: "Media" },
-        React.createElement(Card.Session, null,
+        React.createElement(CardHeader, null,
+            React.createElement(CardTitle, null, "Media"),
+            React.createElement(CardDescription, null, "Manage product images and gallery. Drag and drop to reorder images.")),
+        React.createElement(CardContent, null,
             React.createElement(ImageUploader, { currentImages: (product === null || product === void 0 ? void 0 : product.image) ? [product.image].concat((product === null || product === void 0 ? void 0 : product.gallery) || []) : [], allowDelete: true, allowSwap: true, onDelete: (image) => {
                     const index = fields.findIndex((img) => img.uuid === image.uuid);
                     if (index !== -1) {

package/dist/modules/catalog/pages/admin/productEdit+productNew/Media.js.map

@@ -1 +1 @@
-{"version":3,"file":"Media.js","sourceRoot":"","sources":["../../../../../../src/modules/catalog/pages/admin/productEdit+productNew/Media.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AACjD,OAAO,EAAS,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,KAAK,EAAE,EAAE,SAAS,EAAY,MAAM,OAAO,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAgBhE,MAAM,CAAC,OAAO,UAAU,KAAK,CAAC,EAAE,OAAO,EAAc;IACnD,MAAM,OAAO,GAAG,cAAc,EAAE,CAAC,OAAO,CAAC;IACzC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,aAAa,CAAC;QACxD,IAAI,EAAE,QAAQ;QACd,OAAO;KACR,CAAqC,CAAC;IACvC,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,MAAM,GAAG,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK;YAC3B,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,KAAI,EAAE,CAAC;YAChD,CAAC,CAAC,EAAE,CAAC;QACP,OAAO,CAAC,MAAM,CAAC,CAAC;IAClB,CAAC,EAAE,EAAE,CAAC,CAAC;IACP,OAAO,CACL,oBAAC,IAAI,IAAC,KAAK,EAAC,OAAO;QACjB,oBAAC,IAAI,CAAC,OAAO;YACX,oBAAC,aAAa,IACZ,aAAa,EACX,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,EAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,KAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAEtE,WAAW,EAAE,IAAI,EACjB,SAAS,EAAE,IAAI,EACf,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE;oBAClB,MAAM,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,CAAC,CAAC;oBACjE,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;wBACjB,MAAM,CAAC,KAAK,CAAC,CAAC;oBAChB,CAAC;gBACH,CAAC,EACD,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE;oBACnB,MAAM,CAAC,MAAM,CAAC,CAAC;gBACjB,CAAC,EACD,SAAS,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,EAAE;oBAChC,MAAM,SAAS,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC;oBAC9B,MAAM,CAAC,UAAU,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;oBACnD,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC;oBAC1C,OAAO,CAAC,SAAS,CAAC,CAAC;gBACrB,CAAC,EACD,UAAU,EAAE,WACV,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,GAAG,IAC9C,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,EAAE,GACtD,CACW,CACV,CACR,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,UAAU;IAClB,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;;;;;;;;;;;;CAepB,CAAC"}
+{"version":3,"file":"Media.js","sourceRoot":"","sources":["../../../../../../src/modules/catalog/pages/admin/productEdit+productNew/Media.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EACL,IAAI,EACJ,WAAW,EACX,eAAe,EACf,UAAU,EACV,SAAS,EACV,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAgBhE,MAAM,CAAC,OAAO,UAAU,KAAK,CAAC,EAAE,OAAO,EAAc;IACnD,MAAM,OAAO,GAAG,cAAc,EAAE,CAAC,OAAO,CAAC;IACzC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,aAAa,CAAC;QACxD,IAAI,EAAE,QAAQ;QACd,OAAO;KACR,CAAqC,CAAC;IACvC,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,MAAM,GAAG,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK;YAC3B,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,KAAI,EAAE,CAAC;YAChD,CAAC,CAAC,EAAE,CAAC;QACP,OAAO,CAAC,MAAM,CAAC,CAAC;IAClB,CAAC,EAAE,EAAE,CAAC,CAAC;IACP,OAAO,CACL,oBAAC,IAAI,IAAC,KAAK,EAAC,OAAO;QACjB,oBAAC,UAAU;YACT,oBAAC,SAAS,gBAAkB;YAC5B,oBAAC,eAAe,8EAEE,CACP;QACb,oBAAC,WAAW;YACV,oBAAC,aAAa,IACZ,aAAa,EACX,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,EAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,KAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAEtE,WAAW,EAAE,IAAI,EACjB,SAAS,EAAE,IAAI,EACf,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE;oBAClB,MAAM,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,CAAC,CAAC;oBACjE,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;wBACjB,MAAM,CAAC,KAAK,CAAC,CAAC;oBAChB,CAAC;gBACH,CAAC,EACD,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE;oBACnB,MAAM,CAAC,MAAM,CAAC,CAAC;gBACjB,CAAC,EACD,SAAS,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,EAAE;oBAChC,MAAM,SAAS,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC;oBAC9B,MAAM,CAAC,UAAU,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;oBACnD,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC;oBAC1C,OAAO,CAAC,SAAS,CAAC,CAAC;gBACrB,CAAC,EACD,UAAU,EAAE,WACV,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,GAAG,IAC9C,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,EAAE,GACtD,CACU,CACT,CACR,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,UAAU;IAClB,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;;;;;;;;;;;;CAepB,CAAC"}

package/dist/modules/catalog/pages/admin/productEdit+productNew/Seo.js

@@ -1,7 +1,7 @@
-import { Card } from '@components/admin/Card.js';
 import Area from '@components/common/Area.js';
 import { InputField } from '@components/common/form/InputField.js';
 import { TextareaField } from '@components/common/form/TextareaField.js';
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@components/common/ui/Card.js';
 import React from 'react';
 export default function SEO({ product }) {
     const fields = [
@@ -33,14 +33,17 @@ export default function SEO({ product }) {
         },
         {
             component: {
-                default: (React.createElement(TextareaField, { name: "meta_description", label: "Meta Description", placeholder: "Enter Meta Description", defaultValue: product === null || product === void 0 ? void 0 : product.metaDescription }))
+                default: (React.createElement(TextareaField, { name: "meta_description", label: "Meta Description", placeholder: "Enter Meta Description", defaultValue: (product === null || product === void 0 ? void 0 : product.metaDescription) || '' }))
             },
             sortOrder: 30
         }
     ];
-    return (React.createElement(Card, { title: "Search engine optimize" },
-        React.createElement(Card.Session, null,
-            React.createElement(Area, { id: "productEditSeo", coreComponents: fields }))));
+    return (React.createElement(Card, null,
+        React.createElement(CardHeader, null,
+            React.createElement(CardTitle, null, "SEO"),
+            React.createElement(CardDescription, null, "Manage the SEO settings.")),
+        React.createElement(CardContent, null,
+            React.createElement(Area, { id: "productEditSeo", coreComponents: fields, className: "flex flex-col gap-2" }))));
 }
 export const layout = {
     areaId: 'leftSide',

package/dist/modules/catalog/pages/admin/productEdit+productNew/Seo.js.map

@@ -1 +1 @@
-{"version":3,"file":"Seo.js","sourceRoot":"","sources":["../../../../../../src/modules/catalog/pages/admin/productEdit+productNew/Seo.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AACjD,OAAO,IAAI,MAAM,4BAA4B,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAC;AACzE,OAAO,KAAK,MAAM,OAAO,CAAC;AAY1B,MAAM,CAAC,OAAO,UAAU,GAAG,CAAC,EAAE,OAAO,EAAY;IAC/C,MAAM,MAAM,GAAG;QACb;YACE,SAAS,EAAE;gBACT,OAAO,EAAE,CACP,oBAAC,UAAU,IACT,IAAI,EAAC,SAAS,EACd,KAAK,EAAC,SAAS,EACf,WAAW,EAAC,eAAe,EAC3B,QAAQ,QACR,YAAY,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,EAC7B,UAAU,EAAE;wBACV,QAAQ,EAAE,qBAAqB;wBAC/B,OAAO,EAAE;4BACP,KAAK,EAAE,kCAAkC;4BACzC,OAAO,EACL,8EAA8E;yBACjF;qBACF,GACD,CACH;aACF;YACD,SAAS,EAAE,CAAC;SACb;QACD;YACE,SAAS,EAAE;gBACT,OAAO,EAAE,CACP,oBAAC,UAAU,IACT,IAAI,EAAC,YAAY,EACjB,KAAK,EAAC,YAAY,EAClB,WAAW,EAAC,kBAAkB,EAC9B,QAAQ,QACR,YAAY,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,SAAS,EAChC,UAAU,EAAE;wBACV,QAAQ,EAAE,wBAAwB;qBACnC,GACD,CACH;aACF;YACD,SAAS,EAAE,EAAE;SACd;QACD;YACE,SAAS,EAAE;gBACT,OAAO,EAAE,CACP,oBAAC,UAAU,IACT,IAAI,EAAC,QAAQ,EACb,IAAI,EAAC,eAAe,EACpB,YAAY,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,GACnC,CACH;aACF;YACD,SAAS,EAAE,EAAE;SACd;QACD;YACE,SAAS,EAAE;gBACT,OAAO,EAAE,CACP,oBAAC,aAAa,IACZ,IAAI,EAAC,kBAAkB,EACvB,KAAK,EAAC,kBAAkB,EACxB,WAAW,EAAC,wBAAwB,EACpC,YAAY,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,eAAe,GACtC,CACH;aACF;YACD,SAAS,EAAE,EAAE;SACd;KACF,CAAC;IAEF,OAAO,CACL,oBAAC,IAAI,IAAC,KAAK,EAAC,wBAAwB;QAClC,oBAAC,IAAI,CAAC,OAAO;YACX,oBAAC,IAAI,IAAC,EAAE,EAAC,gBAAgB,EAAC,cAAc,EAAE,MAAM,GAAI,CACvC,CACV,CACR,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,UAAU;IAClB,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;;;;;;CASpB,CAAC"}
+{"version":3,"file":"Seo.js","sourceRoot":"","sources":["../../../../../../src/modules/catalog/pages/admin/productEdit+productNew/Seo.tsx"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,4BAA4B,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAC;AACzE,OAAO,EACL,IAAI,EACJ,WAAW,EACX,eAAe,EACf,UAAU,EACV,SAAS,EACV,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,MAAM,OAAO,CAAC;AAY1B,MAAM,CAAC,OAAO,UAAU,GAAG,CAAC,EAAE,OAAO,EAAY;IAC/C,MAAM,MAAM,GAAG;QACb;YACE,SAAS,EAAE;gBACT,OAAO,EAAE,CACP,oBAAC,UAAU,IACT,IAAI,EAAC,SAAS,EACd,KAAK,EAAC,SAAS,EACf,WAAW,EAAC,eAAe,EAC3B,QAAQ,QACR,YAAY,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,EAC7B,UAAU,EAAE;wBACV,QAAQ,EAAE,qBAAqB;wBAC/B,OAAO,EAAE;4BACP,KAAK,EAAE,kCAAkC;4BACzC,OAAO,EACL,8EAA8E;yBACjF;qBACF,GACD,CACH;aACF;YACD,SAAS,EAAE,CAAC;SACb;QACD;YACE,SAAS,EAAE;gBACT,OAAO,EAAE,CACP,oBAAC,UAAU,IACT,IAAI,EAAC,YAAY,EACjB,KAAK,EAAC,YAAY,EAClB,WAAW,EAAC,kBAAkB,EAC9B,QAAQ,QACR,YAAY,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,SAAS,EAChC,UAAU,EAAE;wBACV,QAAQ,EAAE,wBAAwB;qBACnC,GACD,CACH;aACF;YACD,SAAS,EAAE,EAAE;SACd;QACD;YACE,SAAS,EAAE;gBACT,OAAO,EAAE,CACP,oBAAC,UAAU,IACT,IAAI,EAAC,QAAQ,EACb,IAAI,EAAC,eAAe,EACpB,YAAY,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,GACnC,CACH;aACF;YACD,SAAS,EAAE,EAAE;SACd;QACD;YACE,SAAS,EAAE;gBACT,OAAO,EAAE,CACP,oBAAC,aAAa,IACZ,IAAI,EAAC,kBAAkB,EACvB,KAAK,EAAC,kBAAkB,EACxB,WAAW,EAAC,wBAAwB,EACpC,YAAY,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,eAAe,KAAI,EAAE,GAC5C,CACH;aACF;YACD,SAAS,EAAE,EAAE;SACd;KACF,CAAC;IAEF,OAAO,CACL,oBAAC,IAAI;QACH,oBAAC,UAAU;YACT,oBAAC,SAAS,cAAgB;YAC1B,oBAAC,eAAe,mCAA2C,CAChD;QACb,oBAAC,WAAW;YACV,oBAAC,IAAI,IACH,EAAE,EAAC,gBAAgB,EACnB,cAAc,EAAE,MAAM,EACtB,SAAS,EAAC,qBAAqB,GAC/B,CACU,CACT,CACR,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,UAAU;IAClB,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;;;;;;CASpB,CAAC"}

package/dist/modules/catalog/pages/admin/productEdit+productNew/Shipping.d.ts

@@ -0,0 +1,20 @@
+import React from 'react';
+interface ShippingProps {
+    product: {
+        noShippingRequired: boolean;
+        weight: {
+            value: number;
+            unit: string;
+        };
+    } | undefined;
+    setting: {
+        weightUnit: string;
+    };
+}
+export default function Shipping({ product, setting }: ShippingProps): React.JSX.Element;
+export declare const layout: {
+    areaId: string;
+    sortOrder: number;
+};
+export declare const query = "\n  query Query {\n    product(id: getContextValue(\"productId\", null)) {\n      weight {\n        value\n        unit\n      }\n      noShippingRequired\n    }\n    setting {\n      weightUnit\n    }\n  }\n";
+export {};

package/dist/modules/catalog/pages/admin/productEdit+productNew/Shipping.js

@@ -0,0 +1,52 @@
+import { CheckboxField } from '@components/common/form/CheckboxField.js';
+import { NumberField } from '@components/common/form/NumberField.js';
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@components/common/ui/Card.js';
+import React from 'react';
+import { useFormContext, useWatch } from 'react-hook-form';
+export default function Shipping({ product, setting }) {
+    var _a, _b;
+    const shipping = product || {
+        noShippingRequired: undefined,
+        weight: undefined
+    };
+    const { control } = useFormContext();
+    const noShippingRequired = useWatch({
+        control,
+        name: 'no_shipping_required',
+        defaultValue: (shipping.noShippingRequired !== null && shipping.noShippingRequired) ||
+            false
+    });
+    return (React.createElement(Card, null,
+        React.createElement(CardHeader, null,
+            React.createElement(CardTitle, null, "Shipping"),
+            React.createElement(CardDescription, null, "Manage the shipping settings of the product.")),
+        React.createElement(CardContent, null,
+            React.createElement(CheckboxField, { name: "no_shipping_required", label: "No shipping required?", defaultValue: shipping.noShippingRequired === true, helperText: "Select this option if the product is a digital product or service that does not require shipping.", wrapperClassName: "mb-0" })),
+        React.createElement(CardContent, null,
+            !noShippingRequired && (React.createElement(NumberField, { name: "weight", placeholder: "Enter weight", label: `Weight`, defaultValue: (_a = shipping.weight) === null || _a === void 0 ? void 0 : _a.value, unit: setting === null || setting === void 0 ? void 0 : setting.weightUnit, required: true, validation: {
+                    min: {
+                        value: 0,
+                        message: 'Weight must be a positive number'
+                    }
+                }, helperText: 'Weight must be a positive number' })),
+            noShippingRequired && (React.createElement(NumberField, { name: "weight_no_shipping", placeholder: "Enter weight", label: `Weight`, defaultValue: (_b = shipping.weight) === null || _b === void 0 ? void 0 : _b.value, unit: setting === null || setting === void 0 ? void 0 : setting.weightUnit, disabled: true, helperText: 'Weight must be a positive number' })))));
+}
+export const layout = {
+    areaId: 'rightSide',
+    sortOrder: 15
+};
+export const query = `
+  query Query {
+    product(id: getContextValue("productId", null)) {
+      weight {
+        value
+        unit
+      }
+      noShippingRequired
+    }
+    setting {
+      weightUnit
+    }
+  }
+`;
+//# sourceMappingURL=Shipping.js.map

package/dist/modules/catalog/pages/admin/productEdit+productNew/Shipping.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Shipping.js","sourceRoot":"","sources":["../../../../../../src/modules/catalog/pages/admin/productEdit+productNew/Shipping.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AACrE,OAAO,EACL,IAAI,EACJ,WAAW,EACX,eAAe,EACf,UAAU,EACV,SAAS,EACV,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAgB3D,MAAM,CAAC,OAAO,UAAU,QAAQ,CAAC,EAAE,OAAO,EAAE,OAAO,EAAiB;;IAClE,MAAM,QAAQ,GAAG,OAAO,IAAI;QAC1B,kBAAkB,EAAE,SAAS;QAC7B,MAAM,EAAE,SAAS;KAClB,CAAC;IACF,MAAM,EAAE,OAAO,EAAE,GAAG,cAAc,EAAE,CAAC;IACrC,MAAM,kBAAkB,GAAG,QAAQ,CAAC;QAClC,OAAO;QACP,IAAI,EAAE,sBAAsB;QAC5B,YAAY,EACV,CAAC,QAAQ,CAAC,kBAAkB,KAAK,IAAI,IAAI,QAAQ,CAAC,kBAAkB,CAAC;YACrE,KAAK;KACR,CAAC,CAAC;IAEH,OAAO,CACL,oBAAC,IAAI;QACH,oBAAC,UAAU;YACT,oBAAC,SAAS,mBAAqB;YAC/B,oBAAC,eAAe,uDAEE,CACP;QACb,oBAAC,WAAW;YACV,oBAAC,aAAa,IACZ,IAAI,EAAC,sBAAsB,EAC3B,KAAK,EAAC,uBAAuB,EAC7B,YAAY,EAAE,QAAQ,CAAC,kBAAkB,KAAK,IAAI,EAClD,UAAU,EAAC,mGAAmG,EAC9G,gBAAgB,EAAC,MAAM,GACvB,CACU;QACd,oBAAC,WAAW;YACT,CAAC,kBAAkB,IAAI,CACtB,oBAAC,WAAW,IACV,IAAI,EAAC,QAAQ,EACb,WAAW,EAAC,cAAc,EAC1B,KAAK,EAAE,QAAQ,EACf,YAAY,EAAE,MAAA,QAAQ,CAAC,MAAM,0CAAE,KAAK,EACpC,IAAI,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,EACzB,QAAQ,QACR,UAAU,EAAE;oBACV,GAAG,EAAE;wBACH,KAAK,EAAE,CAAC;wBACR,OAAO,EAAE,kCAAkC;qBAC5C;iBACF,EACD,UAAU,EAAE,kCAAkC,GAC9C,CACH;YACA,kBAAkB,IAAI,CACrB,oBAAC,WAAW,IACV,IAAI,EAAC,oBAAoB,EACzB,WAAW,EAAC,cAAc,EAC1B,KAAK,EAAE,QAAQ,EACf,YAAY,EAAE,MAAA,QAAQ,CAAC,MAAM,0CAAE,KAAK,EACpC,IAAI,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,EACzB,QAAQ,QACR,UAAU,EAAE,kCAAkC,GAC9C,CACH,CACW,CACT,CACR,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,WAAW;IACnB,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;;;;;;;;;;CAapB,CAAC"}

package/dist/modules/catalog/pages/admin/productEdit+productNew/Status.js

@@ -1,18 +1,22 @@
-import { Card } from '@components/admin/Card.js';
 import { RadioGroupField } from '@components/common/form/RadioGroupField.js';
+import { Card, CardHeader, CardDescription, CardContent, CardFooter, CardTitle } from '@components/common/ui/Card.js';
 import React from 'react';
 export default function Status({ product }) {
-    return (React.createElement(Card, { title: "Product status", subdued: true },
-        React.createElement(Card.Session, null,
+    return (React.createElement(Card, { className: "bg-popover" },
+        React.createElement(CardHeader, null,
+            React.createElement(CardTitle, null, "Product Status"),
+            React.createElement(CardDescription, null, "Set the status and visibility of the product.")),
+        React.createElement(CardContent, null,
             React.createElement(RadioGroupField, { name: "status", label: "Status", options: [
                     { value: 0, label: 'Disabled' },
                     { value: 1, label: 'Enabled' }
                 ], defaultValue: (product === null || product === void 0 ? void 0 : product.status) === 0 ? 0 : 1, required: true, helperText: "Disabled products will not be visible in the store and cannot be purchased." })),
-        React.createElement(Card.Session, null,
+        React.createElement(CardContent, { className: "border-t border-t-border pt-6" },
             React.createElement(RadioGroupField, { name: "visibility", label: "Visibility", options: [
                     { value: 0, label: 'Not visible individually' },
                     { value: 1, label: 'Catalog, Search' }
-                ], defaultValue: (product === null || product === void 0 ? void 0 : product.visibility) === 0 ? 0 : 1, required: true, helperText: "Visibility determines where the product appears in the store. It does not affect the saleability of the product." }))));
+                ], defaultValue: (product === null || product === void 0 ? void 0 : product.visibility) === 0 ? 0 : 1, required: true, helperText: "Visibility determines where the product appears in the store. It does not affect the saleability of the product." })),
+        React.createElement(CardFooter, null)));
 }
 export const layout = {
     areaId: 'rightSide',

package/dist/modules/catalog/pages/admin/productEdit+productNew/Status.js.map

@@ -1 +1 @@
-{"version":3,"file":"Status.js","sourceRoot":"","sources":["../../../../../../src/modules/catalog/pages/admin/productEdit+productNew/Status.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAC7E,OAAO,KAAK,MAAM,OAAO,CAAC;AAU1B,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,EAAE,OAAO,EAAe;IACrD,OAAO,CACL,oBAAC,IAAI,IAAC,KAAK,EAAC,gBAAgB,EAAC,OAAO;QAClC,oBAAC,IAAI,CAAC,OAAO;YACX,oBAAC,eAAe,IACd,IAAI,EAAC,QAAQ,EACb,KAAK,EAAC,QAAQ,EACd,OAAO,EAAE;oBACP,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE;oBAC/B,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE;iBAC/B,EACD,YAAY,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,MAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAC3C,QAAQ,QACR,UAAU,EAAC,6EAA6E,GACxF,CACW;QACf,oBAAC,IAAI,CAAC,OAAO;YACX,oBAAC,eAAe,IACd,IAAI,EAAC,YAAY,EACjB,KAAK,EAAC,YAAY,EAClB,OAAO,EAAE;oBACP,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,0BAA0B,EAAE;oBAC/C,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,iBAAiB,EAAE;iBACvC,EACD,YAAY,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,MAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAC/C,QAAQ,QACR,UAAU,EAAC,kHAAkH,GAC7H,CACW,CACV,CACR,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,WAAW;IACnB,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;;;;;;;;CAWpB,CAAC"}
+{"version":3,"file":"Status.js","sourceRoot":"","sources":["../../../../../../src/modules/catalog/pages/admin/productEdit+productNew/Status.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAC7E,OAAO,EACL,IAAI,EACJ,UAAU,EACV,eAAe,EACf,WAAW,EACX,UAAU,EACV,SAAS,EACV,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,MAAM,OAAO,CAAC;AAU1B,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,EAAE,OAAO,EAAe;IACrD,OAAO,CACL,oBAAC,IAAI,IAAC,SAAS,EAAC,YAAY;QAC1B,oBAAC,UAAU;YACT,oBAAC,SAAS,yBAA2B;YACrC,oBAAC,eAAe,wDAEE,CACP;QACb,oBAAC,WAAW;YACV,oBAAC,eAAe,IACd,IAAI,EAAC,QAAQ,EACb,KAAK,EAAC,QAAQ,EACd,OAAO,EAAE;oBACP,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE;oBAC/B,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE;iBAC/B,EACD,YAAY,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,MAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAC3C,QAAQ,QACR,UAAU,EAAC,6EAA6E,GACxF,CACU;QACd,oBAAC,WAAW,IAAC,SAAS,EAAC,+BAA+B;YACpD,oBAAC,eAAe,IACd,IAAI,EAAC,YAAY,EACjB,KAAK,EAAC,YAAY,EAClB,OAAO,EAAE;oBACP,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,0BAA0B,EAAE;oBAC/C,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,iBAAiB,EAAE;iBACvC,EACD,YAAY,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,MAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAC/C,QAAQ,QACR,UAAU,EAAC,kHAAkH,GAC7H,CACU;QACd,oBAAC,UAAU,OAAc,CACpB,CACR,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,WAAW;IACnB,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;;;;;;;;CAWpB,CAAC"}