diff --git a/.vscode/settings.json b/.vscode/settings.json index d3381123..4bbfb0bf 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,7 +1,4 @@ { - "eslint.workingDirectories": [ - "./app", - "./cms" - ], - "workbench.startupEditor": "none", -} \ No newline at end of file + "eslint.workingDirectories": ["./app", "./cms"], + "workbench.startupEditor": "none" +} diff --git a/app/components/menubar/newMenuBar.js b/app/components/menubar/newMenuBar.js index fe1d1d63..28ce249f 100644 --- a/app/components/menubar/newMenuBar.js +++ b/app/components/menubar/newMenuBar.js @@ -16,7 +16,11 @@ const ArrowIcon = () => { fill='none' xmlns='http://www.w3.org/2000/svg' > - + ); }; @@ -26,7 +30,10 @@ const MobileNav = ({ nav_Items, nft, brandInfo }) => { const { user, handleLogin, handleLogout, handleResend, isModalOpen, setIsModalOpen, method } = useRCAuth4Google(); return ( - + { { {nav_Items?.map((nav_Item) => nav_Item.url ? ( -
- { - setDropDown({ show: false, _id: 0 }); - }} - > - - - {nav_Item.label} - - - -
+ +
+ { + setDropDown({ show: false, _id: 0 }); + }} + > + {nav_Item.label} + +
+
) : (
{ {nav_Item.sub_menus?.data?.length > 1 && ( - - +
)} {dropDown._id === nav_Item.id && dropDown.show ? (
-
+
{nav_Item.sub_menus.data.map( (item) => item.attributes.parent_id === null && ( <> - + +
{item.attributes.label}
+
+ + {/* If more sub-items are present */} {nav_Item.sub_menus.data.map( (subItem) => subItem.attributes.parent_id === item.attributes.id && ( - + ) )} @@ -157,7 +159,9 @@ const MobileNav = ({ nav_Items, nft, brandInfo }) => { - {nft ? : + {nft ? ( + + ) : ( { isModalOpen={isModalOpen} setIsModalOpen={setIsModalOpen} method={method} - />} + /> + )} @@ -195,15 +200,23 @@ const DesktopNav = ({ nav_Items, nft, brandInfo }) => { return ( - -