diff --git a/public/Logo.png b/public/Logo.png index bdd8276..2c0068f 100644 Binary files a/public/Logo.png and b/public/Logo.png differ diff --git a/public/Logo_2.png b/public/Logo_2.png new file mode 100644 index 0000000..bdd8276 Binary files /dev/null and b/public/Logo_2.png differ diff --git a/src/Pages/Categories/View/Add/AttributeValueTab/AttributeTabs.tsx b/src/Pages/Categories/View/Add/AttributeValueTab/AttributeTabs.tsx index 50bde38..017e015 100644 --- a/src/Pages/Categories/View/Add/AttributeValueTab/AttributeTabs.tsx +++ b/src/Pages/Categories/View/Add/AttributeValueTab/AttributeTabs.tsx @@ -33,7 +33,7 @@ export const AttributeValueTabs: React.FC = ({ parentKe type Color = GetProp; const handelchangeColor = (value: Color, hex: string)=>{ - console.log(hex); + console.log(hex,"hex"); setFieldValue(`Attribute.${parentKey}.AttributeValue.${tabKey}.value_en`,hex) } @@ -73,6 +73,7 @@ export const AttributeValueTabs: React.FC = ({ parentKe className=' ' format='hex' size='large' + /> diff --git a/src/Pages/Categories/View/AddPage.tsx b/src/Pages/Categories/View/AddPage.tsx index 2ad656f..61e08e0 100644 --- a/src/Pages/Categories/View/AddPage.tsx +++ b/src/Pages/Categories/View/AddPage.tsx @@ -107,8 +107,8 @@ const AddcategoriesPage = () => { if (Array.isArray(item.AttributeValue)) { item?.AttributeValue.slice(1)?.forEach((attrItem: any, index: number) => { if (attrItem && Object.keys(attrItem).length > 0) { - const hexColorRegex = /^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$/; - if (attrItem && !hexColorRegex.test(attrItem?.value_en)) { + const hexColorRegex = /^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6}|[0-9a-fA-F]{8})$/; + if (attrItem && !hexColorRegex.test(attrItem?.value_en)) { toast.error(`${t('required_color')} ${index + 1}`); validationResults.push(false); } else { diff --git a/src/Pages/Categories/View/EditPage.tsx b/src/Pages/Categories/View/EditPage.tsx index 5bfc146..142ce00 100644 --- a/src/Pages/Categories/View/EditPage.tsx +++ b/src/Pages/Categories/View/EditPage.tsx @@ -164,8 +164,8 @@ const EditPage = () => { if (Array.isArray(item.AttributeValue)) { item?.AttributeValue.slice(1)?.forEach((attrItem: any, index: number) => { if (attrItem && Object.keys(attrItem).length > 0) { - const hexColorRegex = /^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$/; - if (attrItem && !hexColorRegex.test(attrItem?.value_en)) { + const hexColorRegex = /^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6}|[0-9a-fA-F]{8})$/; + if (attrItem && !hexColorRegex.test(attrItem?.value_en)) { toast.error(`${t('required_color')} ${index + 1}`); validationResults.push(false); } else { diff --git a/src/Pages/order/View/ViewForm.tsx b/src/Pages/order/View/ViewForm.tsx index e8573d4..b9d7a31 100644 --- a/src/Pages/order/View/ViewForm.tsx +++ b/src/Pages/order/View/ViewForm.tsx @@ -13,6 +13,8 @@ function Form() { const { id } = useParams() const { data, isLoading } = useGetOneOrder({ id: id }) const order = data?.data || {}; + console.log(order,"order"); + if (isLoading) { return diff --git a/src/Styles/Layout/SideBar.scss b/src/Styles/Layout/SideBar.scss index ad617cc..15fd911 100644 --- a/src/Styles/Layout/SideBar.scss +++ b/src/Styles/Layout/SideBar.scss @@ -42,6 +42,7 @@ overflow-x: hidden; z-index: 9999999; img{ margin-inline: 10px; + width: 60px; } .HamburgerMenu{ z-index: 999999999999999;