@evenicanpm/storefront-core 1.8.1 → 2.0.0

package/src/{components-v2 → components}/categories/mega-menu/mega-menu-2.tsx

@@ -1,10 +1,10 @@
 // LOCAL CUSTOM COMPONENTS
 
-import CategoryMenuItem from "@evenicanpm/storefront-core/src/components-v2/categories/category-list-item/index";
-import OfferBanner from "@evenicanpm/storefront-core/src/components-v2/categories/mega-menu/banner";
-import ColumnList from "@evenicanpm/storefront-core/src/components-v2/categories/mega-menu/column-list";
+import CategoryMenuItem from "@evenicanpm/storefront-core/src/components/categories/category-list-item/index";
+import OfferBanner from "@evenicanpm/storefront-core/src/components/categories/mega-menu/banner";
+import ColumnList from "@evenicanpm/storefront-core/src/components/categories/mega-menu/column-list";
 // STYLED COMPONENT
-import { StyledRoot } from "@evenicanpm/storefront-core/src/components-v2/categories/mega-menu/styles";
+import { StyledRoot } from "@evenicanpm/storefront-core/src/components/categories/mega-menu/styles";
 // DATA TYPE
 import type { CategoryHierarchy } from "@evenicanpm/storefront-core/src/lib/category-helpers";
 

package/src/{components-v2 → components}/flex-box/__tests__/flex-box.test.tsx

@@ -1,6 +1,6 @@
 import { render, screen } from "@testing-library/react";
-import FlexBox from "../flex-box";
 import FlexBetween from "../flex-between";
+import FlexBox from "../flex-box";
 import FlexRowCenter from "../flex-row-center";
 
 describe("FlexBox components", () => {
@@ -27,7 +27,7 @@ describe("FlexBox components", () => {
 
 			const box = screen.getByTestId("flex-box");
 			expect(box).toBeInTheDocument();
-			expect(box).toHaveStyle("display: flex");
+			expect(box.className).toContain("MuiBox-root");
 		});
 	});
 
@@ -44,9 +44,8 @@ describe("FlexBox components", () => {
 			expect(screen.getByText("Right")).toBeInTheDocument();
 
 			const box = screen.getByTestId("flex-between");
-			expect(box).toHaveStyle("display: flex");
-			expect(box).toHaveStyle("justify-content: space-between");
-			expect(box).toHaveStyle("align-items: center");
+			expect(box).toBeInTheDocument();
+			expect(box.className).toContain("MuiBox-root");
 		});
 
 		it("accepts custom props", () => {
@@ -70,9 +69,8 @@ describe("FlexBox components", () => {
 
 			const box = screen.getByTestId("flex-row-center");
 			expect(screen.getByText("Centered")).toBeInTheDocument();
-			expect(box).toHaveStyle("display: flex");
-			expect(box).toHaveStyle("justify-content: center");
-			expect(box).toHaveStyle("align-items: center");
+			expect(box).toBeInTheDocument();
+			expect(box.className).toContain("MuiBox-root");
 		});
 
 		it("applies custom styles", () => {

package/src/components/flex-box/index.ts

@@ -0,0 +1,5 @@
+import FlexBetween from "@evenicanpm/storefront-core/src/components/flex-box/flex-between";
+import FlexBox from "@evenicanpm/storefront-core/src/components/flex-box/flex-box";
+import FlexRowCenter from "@evenicanpm/storefront-core/src/components/flex-box/flex-row-center";
+
+export { FlexBetween, FlexBox, FlexRowCenter };

package/src/{components-v2 → components}/header/__tests__/header.test.tsx

@@ -7,6 +7,10 @@ vi.mock("@evenicanpm/storefront-core/src/hooks/use-nextauth-session", () => ({
 	useAppSession: vi.fn(() => ({ session: null })),
 }));
 
+vi.mock("next-auth/react", () => ({
+	useSession: () => ({ data: null, status: "unauthenticated" }),
+}));
+
 vi.mock(
 	"@evenicanpm/storefront-core/src/api-manager/services/cart/queries/get-cart",
 	() => ({
@@ -17,7 +21,7 @@ vi.mock(
 );
 
 vi.mock(
-	"@evenicanpm/storefront-core/src/components-v2/mini-cart/mini-cart-trigger",
+	"@evenicanpm/storefront-core/src/components/mini-cart/mini-cart-trigger",
 	() => ({
 		default: ({ children }: { children: React.ReactNode }) => (
 			<div data-testid="mini-cart-trigger">{children}</div>
@@ -25,19 +29,19 @@ vi.mock(
 	}),
 );
 
-vi.mock("@evenicanpm/storefront-core/src/components-v2/site-logo", () => ({
+vi.mock("@evenicanpm/storefront-core/src/components/site-logo", () => ({
 	default: () => <div data-testid="site-logo">Logo</div>,
 }));
 
 vi.mock(
-	"@evenicanpm/storefront-core/src/components-v2/header/components/categories-menu",
+	"@evenicanpm/storefront-core/src/components/header/components/categories-menu",
 	() => ({
 		default: () => <div data-testid="categories-menu">Categories</div>,
 	}),
 );
 
 vi.mock(
-	"@evenicanpm/storefront-core/src/components-v2/header/components/user",
+	"@evenicanpm/storefront-core/src/components/header/components/user",
 	() => {
 		const User = ({ children }: { children?: ReactNode }) => (
 			<div data-testid="user-component">User: {children}</div>

package/src/{components-v2 → components}/header/__tests__/user.test.tsx

@@ -1,5 +1,5 @@
 import signOut from "@evenicanpm/storefront-core/src/auth/signout";
-import Header from "@evenicanpm/storefront-core/src/components-v2/header/header";
+import Header from "@evenicanpm/storefront-core/src/components/header/header";
 import { fireEvent, render, screen, waitFor } from "@testing-library/react";
 import { NextIntlClientProvider } from "next-intl";
 import { vi } from "vitest";

package/src/{components-v2 → components}/header/components/categories-menu.tsx

@@ -1,8 +1,8 @@
-import CategoryMenu from "@evenicanpm/storefront-core/src/components-v2/categories/category-menu";
+import CategoryMenu from "@evenicanpm/storefront-core/src/components/categories/category-menu";
 // GLOBAL CUSTOM COMPONENTS
-import { FlexBox } from "@evenicanpm/storefront-core/src/components-v2/flex-box/index";
+import { FlexBox } from "@evenicanpm/storefront-core/src/components/flex-box/index";
 // CUSTOM ICON COMPONENTS
-import Category from "@evenicanpm/storefront-core/src/components-v2/icons/category";
+import Category from "@evenicanpm/storefront-core/src/components/icons/category";
 // MUI ICON COMPONENT
 import KeyboardArrowDown from "@mui/icons-material/KeyboardArrowDown";
 import Button from "@mui/material/Button";

package/src/{components-v2 → components}/header/components/mobile-header.tsx

@@ -3,21 +3,21 @@ import getCart from "@evenicanpm/storefront-core/src/api-manager/services/cart/q
 import {
 	FlexBetween,
 	FlexBox,
-} from "@evenicanpm/storefront-core/src/components-v2/flex-box/index";
-import User from "@evenicanpm/storefront-core/src/components-v2/header/components/user";
-import useHeader from "@evenicanpm/storefront-core/src/components-v2/header/hooks/use-header";
-import MobileCartBag from "@evenicanpm/storefront-core/src/components-v2/icons/cart-bag";
-import Search from "@evenicanpm/storefront-core/src/components-v2/icons/search";
-import MiniCartTrigger from "@evenicanpm/storefront-core/src/components-v2/mini-cart/mini-cart-trigger";
-import { MobileMenu } from "@evenicanpm/storefront-core/src/components-v2/navbar/mobile-menu/index";
+} from "@evenicanpm/storefront-core/src/components/flex-box/index";
+import User from "@evenicanpm/storefront-core/src/components/header/components/user";
+import useHeader from "@evenicanpm/storefront-core/src/components/header/hooks/use-header";
+import MobileCartBag from "@evenicanpm/storefront-core/src/components/icons/cart-bag";
+import Search from "@evenicanpm/storefront-core/src/components/icons/search";
+import MiniCartTrigger from "@evenicanpm/storefront-core/src/components/mini-cart/mini-cart-trigger";
+import { MobileMenu } from "@evenicanpm/storefront-core/src/components/navbar/mobile-menu/index";
 import {
 	transformCategoryNav,
 	transformCmsNav,
-} from "@evenicanpm/storefront-core/src/components-v2/navbar/utils/transform-nav";
-import { SearchBarViewSm as SearchBar } from "@evenicanpm/storefront-core/src/components-v2/search-bar";
-import SiteLogo from "@evenicanpm/storefront-core/src/components-v2/site-logo";
+} from "@evenicanpm/storefront-core/src/components/navbar/utils/transform-nav";
+import { SearchBarViewSm as SearchBar } from "@evenicanpm/storefront-core/src/components/search-bar";
+import SiteLogo from "@evenicanpm/storefront-core/src/components/site-logo";
 // CUSTOM COMPONENTS
-import { Paragraph } from "@evenicanpm/storefront-core/src/components-v2/Typography";
+import { Paragraph } from "@evenicanpm/storefront-core/src/components/Typography";
 import { NavContext } from "@evenicanpm/storefront-core/src/providers/nav-provider";
 import Box from "@mui/material/Box";
 import Drawer from "@mui/material/Drawer";

package/src/{components-v2 → components}/header/components/user.tsx

@@ -9,9 +9,9 @@ import {
 	initializeMsal,
 } from "@evenicanpm/storefront-core/src/auth/msal";
 import signOutCustom from "@evenicanpm/storefront-core/src/auth/signout";
-import MobileUserIcon from "@evenicanpm/storefront-core/src/components-v2/icons/user";
-import { NavLink } from "@evenicanpm/storefront-core/src/components-v2/nav-link";
-import T from "@evenicanpm/storefront-core/src/components-v2/T";
+import MobileUserIcon from "@evenicanpm/storefront-core/src/components/icons/user";
+import { NavLink } from "@evenicanpm/storefront-core/src/components/nav-link";
+import T from "@evenicanpm/storefront-core/src/components/T";
 // UI Components
 import {
 	Box,

package/src/{components-v2 → components}/header/header.tsx

@@ -3,17 +3,17 @@
 // API
 import getCart from "@evenicanpm/storefront-core/src/api-manager/services/cart/queries/get-cart";
 // GLOBAL CUSTOM COMPONENTS
-import FlexBox from "@evenicanpm/storefront-core/src/components-v2/flex-box/flex-box";
+import FlexBox from "@evenicanpm/storefront-core/src/components/flex-box/flex-box";
 // LOCAL CUSTOM COMPONENTS
-import CategoriesMenu from "@evenicanpm/storefront-core/src/components-v2/header/components/categories-menu";
-import User from "@evenicanpm/storefront-core/src/components-v2/header/components/user";
+import CategoriesMenu from "@evenicanpm/storefront-core/src/components/header/components/categories-menu";
+import User from "@evenicanpm/storefront-core/src/components/header/components/user";
 // STYLED COMPONENTS
 import {
 	HeaderWrapper,
 	StyledContainer,
-} from "@evenicanpm/storefront-core/src/components-v2/header/styles/index";
-import MiniCartTrigger from "@evenicanpm/storefront-core/src/components-v2/mini-cart/mini-cart-trigger";
-import SiteLogo from "@evenicanpm/storefront-core/src/components-v2/site-logo";
+} from "@evenicanpm/storefront-core/src/components/header/styles/index";
+import MiniCartTrigger from "@evenicanpm/storefront-core/src/components/mini-cart/mini-cart-trigger";
+import SiteLogo from "@evenicanpm/storefront-core/src/components/site-logo";
 import { useAppSession } from "@evenicanpm/storefront-core/src/hooks/use-nextauth-session";
 import clsx from "clsx";
 import type { ReactNode } from "react";

package/src/{components-v2 → components}/header/index.ts

@@ -1 +1 @@
-export { default } from "@evenicanpm/storefront-core/src/components-v2/header/header";
+export { default } from "@evenicanpm/storefront-core/src/components/header/header";

package/src/{components-v2 → components}/header/sticky-header.tsx

@@ -1,8 +1,8 @@
 "use client";
 
-import MobileHeader from "@evenicanpm/storefront-core/src/components-v2/header/components/mobile-header";
-import Header from "@evenicanpm/storefront-core/src/components-v2/header/index";
-import { SearchBarViewLg as SearchBar } from "@evenicanpm/storefront-core/src/components-v2/search-bar";
+import MobileHeader from "@evenicanpm/storefront-core/src/components/header/components/mobile-header";
+import Header from "@evenicanpm/storefront-core/src/components/header/index";
+import { SearchBarViewLg as SearchBar } from "@evenicanpm/storefront-core/src/components/search-bar";
 import { Sticky } from "@evenicanpm/ui";
 
 import useTheme from "@mui/material/styles/useTheme";

package/src/{components-v2 → components}/icons/cart-bag.tsx

@@ -2,6 +2,7 @@ import createSvgIcon from "@mui/material/utils/createSvgIcon";
 
 const CartBag = createSvgIcon(
 	<svg viewBox="0 0 20 23" fill="none" xmlns="http://www.w3.org/2000/svg">
+		<title>Cart Bag</title>
 		<path
 			d="M5.33329 7.37181V5.37181C5.33329 2.79431 7.42079 0.705139 9.99996 0.705139C12.5791 0.705139 14.6666 2.79431 14.6666 5.37181V7.37181H17.3333C18.4375 7.37181 19.3333 8.26764 19.3333 9.37181V18.0385C19.3333 20.2468 17.5416 22.0385 15.3333 22.0385H4.66663C2.45746 22.0385 0.666626 20.2468 0.666626 18.0385V9.37181C0.666626 8.26764 1.56204 7.37181 2.66663 7.37181H5.33329ZM7.33329 7.37181H12.6666V5.37181C12.6666 3.89889 11.4708 2.70514 9.99996 2.70514C8.52913 2.70514 7.33329 3.89889 7.33329 5.37181V7.37181ZM2.66663 9.37181V18.0385C2.66663 19.1426 3.56204 20.0385 4.66663 20.0385H15.3333C16.4375 20.0385 17.3333 19.1426 17.3333 18.0385V9.37181H14.6666V11.7051C14.6666 12.2593 14.2208 12.7051 13.6666 12.7051C13.1125 12.7051 12.6666 12.2593 12.6666 11.7051V9.37181H7.33329V11.7051C7.33329 12.2593 6.88746 12.7051 6.33329 12.7051C5.77913 12.7051 5.33329 12.2593 5.33329 11.7051V9.37181H2.66663Z"
 			fill="currentColor"

package/src/{components-v2 → components}/icons/category-outline.tsx

@@ -2,6 +2,7 @@ import createSvgIcon from "@mui/material/utils/createSvgIcon";
 
 const CategoryOutlined = createSvgIcon(
 	<svg fill="currentColor" viewBox="0 0 24 24">
+		<title>Category</title>
 		<path
 			fillRule="evenodd"
 			clipRule="evenodd"

package/src/{components-v2 → components}/icons/category.tsx

@@ -4,6 +4,7 @@ import createSvgIcon from "@mui/material/utils/createSvgIcon";
 
 const Category = createSvgIcon(
 	<svg fill="currentColor" viewBox="0 0 64 64">
+		<title>Category</title>
 		<path d="m29 11v14a4 4 0 0 1 -4 4h-14a4 4 0 0 1 -4-4v-14a4 4 0 0 1 4-4h14a4 4 0 0 1 4 4zm24-4h-14a4 4 0 0 0 -4 4v14a4 4 0 0 0 4 4h14a4 4 0 0 0 4-4v-14a4 4 0 0 0 -4-4zm-28 28h-14a4 4 0 0 0 -4 4v14a4 4 0 0 0 4 4h14a4 4 0 0 0 4-4v-14a4 4 0 0 0 -4-4zm21 0a11 11 0 1 0 11 11 11 11 0 0 0 -11-11z" />
 	</svg>,
 	"Category",

package/src/{components-v2 → components}/icons/home.tsx

@@ -2,6 +2,7 @@ import createSvgIcon from "@mui/material/utils/createSvgIcon";
 
 const Home = createSvgIcon(
 	<svg fill="currentColor" viewBox="0 0 24 24">
+		<title>Home</title>
 		<path
 			fillRule="evenodd"
 			clipRule="evenodd"

package/src/{components-v2 → components}/icons/search.tsx

@@ -2,6 +2,7 @@ import createSvgIcon from "@mui/material/utils/createSvgIcon";
 
 const Search = createSvgIcon(
 	<svg viewBox="0 0 22 23" fill="none" xmlns="http://www.w3.org/2000/svg">
+		<title>Search</title>
 		<path
 			d="M21.3162 20.0056L17.2879 15.9891C18.5876 14.3333 19.2928 12.2886 19.2902 10.1836C19.2902 8.30891 18.7343 6.47636 17.6928 4.91764C16.6513 3.35892 15.1709 2.14405 13.439 1.42665C11.707 0.709246 9.80123 0.521542 7.96259 0.887269C6.12396 1.253 4.43507 2.15573 3.10948 3.48131C1.7839 4.80689 0.88117 6.49579 0.515443 8.33442C0.149715 10.1731 0.33742 12.0788 1.05482 13.8108C1.77222 15.5428 2.98709 17.0231 4.54581 18.0646C6.10453 19.1061 7.93709 19.662 9.81174 19.662C11.9167 19.6646 13.9615 18.9594 15.6173 17.6597L19.6338 21.688C19.7439 21.7991 19.8749 21.8872 20.0193 21.9474C20.1637 22.0075 20.3186 22.0385 20.475 22.0385C20.6314 22.0385 20.7862 22.0075 20.9306 21.9474C21.075 21.8872 21.206 21.7991 21.3162 21.688C21.4272 21.5779 21.5154 21.4468 21.5755 21.3024C21.6357 21.1581 21.6666 21.0032 21.6666 20.8468C21.6666 20.6904 21.6357 20.5355 21.5755 20.3912C21.5154 20.2468 21.4272 20.1157 21.3162 20.0056ZM2.70292 10.1836C2.70292 8.77758 3.11985 7.40316 3.90098 6.23412C4.6821 5.06508 5.79235 4.15393 7.09132 3.61588C8.39028 3.07783 9.81963 2.93705 11.1986 3.21134C12.5776 3.48564 13.8443 4.16269 14.8384 5.15688C15.8326 6.15106 16.5097 7.41773 16.784 8.79671C17.0583 10.1757 16.9175 11.605 16.3794 12.904C15.8414 14.203 14.9302 15.3132 13.7612 16.0943C12.5922 16.8755 11.2177 17.2924 9.81174 17.2924C7.92637 17.2924 6.11821 16.5434 4.78505 15.2103C3.45189 13.8771 2.70292 12.0689 2.70292 10.1836Z"
 			fill="currentColor"

package/src/{components-v2 → components}/icons/shopping-bag-outlined.tsx

@@ -2,6 +2,7 @@ import createSvgIcon from "@mui/material/utils/createSvgIcon";
 
 const ShoppingBagOutlined = createSvgIcon(
 	<svg fill="currentColor" viewBox="0 0 24 24">
+		<title>Shopping Bag</title>
 		<g>
 			<rect fill="none" height="24" width="24" />
 			<path d="M18,6h-2c0-2.21-1.79-4-4-4S8,3.79,8,6H6C4.9,6,4,6.9,4,8v12c0,1.1,0.9,2,2,2h12c1.1,0,2-0.9,2-2V8C20,6.9,19.1,6,18,6z M12,4c1.1,0,2,0.9,2,2h-4C10,4.9,10.9,4,12,4z M18,20H6V8h2v2c0,0.55,0.45,1,1,1s1-0.45,1-1V8h4v2c0,0.55,0.45,1,1,1s1-0.45,1-1V8 h2V20z" />

package/src/{components-v2 → components}/icons/up-down.tsx

@@ -2,6 +2,7 @@ import createSvgIcon from "@mui/material/utils/createSvgIcon";
 
 const UpDown = createSvgIcon(
 	<svg viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+		<title>Sort</title>
 		<path
 			d="M8.64847 6.88354H3.35158C3.04454 6.88354 2.86173 7.2269 3.03517 7.4812L5.68362 11.3824C5.83596 11.6062 6.16526 11.6062 6.3176 11.3824L8.96605 7.4812C9.13714 7.2269 8.9555 6.88354 8.64847 6.88354Z"
 			fill="currentColor"

package/src/{components-v2 → components}/icons/user.tsx

@@ -2,6 +2,7 @@ import createSvgIcon from "@mui/material/utils/createSvgIcon";
 
 const User = createSvgIcon(
 	<svg viewBox="0 0 20 23" fill="none" xmlns="http://www.w3.org/2000/svg">
+		<title>User</title>
 		<path
 			d="M12 13.3718H8.00002C3.95002 13.3718 0.666687 16.6551 0.666687 20.7051C0.666687 21.4414 1.26377 22.0385 2.00002 22.0385H18C18.7363 22.0385 19.3334 21.4414 19.3334 20.7051C19.3334 16.6551 16.05 13.3718 12 13.3718ZM2.70794 20.0385C3.0371 17.4093 5.28335 15.3718 8.00002 15.3718H12C14.715 15.3718 16.9625 17.4114 17.2917 20.0385H2.70794ZM10 11.3718C12.9454 11.3718 15.3334 8.98389 15.3334 6.03847C15.3334 3.09306 12.9454 0.705139 10 0.705139C7.0546 0.705139 4.66669 3.09306 4.66669 6.03847C4.66669 8.98431 7.05419 11.3718 10 11.3718ZM10 2.70514C11.8379 2.70514 13.3334 4.20056 13.3334 6.03847C13.3334 7.87639 11.8379 9.37181 10 9.37181C8.1621 9.37181 6.66669 7.87597 6.66669 6.03847C6.66669 4.20056 8.16252 2.70514 10 2.70514Z"
 			fill="currentColor"

package/src/{components-v2 → components}/icons/user2.tsx

@@ -2,6 +2,7 @@ import createSvgIcon from "@mui/material/utils/createSvgIcon";
 
 const User2 = createSvgIcon(
 	<svg fill="currentColor" viewBox="0 0 24 24">
+		<title>User</title>
 		<path
 			d="M6.65 7.5C6.65 9.21452 7.46395 10.7392 8.72162 11.7184C4.89924 13.0726 2.15 16.7186 2.15 21C2.15 21.47 2.53084 21.85 3 21.85H21C21.4692 21.85 21.85 21.47 21.85 21C21.85 16.7186 19.1008 13.0726 15.2784 11.7184C16.536 10.7392 17.35 9.21452 17.35 7.5C17.35 4.55053 14.9502 2.15 12 2.15C9.04976 2.15 6.65 4.55053 6.65 7.5ZM8.35 7.5C8.35 5.48748 9.98748 3.85 12 3.85C14.0125 3.85 15.65 5.48748 15.65 7.5C15.65 9.51252 14.0125 11.15 12 11.15C9.98748 11.15 8.35 9.51252 8.35 7.5ZM20.106 20.15H3.89395C4.32041 16.0538 7.79275 12.85 12 12.85C16.2072 12.85 19.6796 16.0538 20.106 20.15Z"
 			stroke="#395589"

package/src/{components-v2 → components}/mini-cart/components/cart-item.tsx

@@ -1,11 +1,11 @@
 // @refresh reset
 "use client";
 
-import { FlexBox } from "@evenicanpm/storefront-core/src/components-v2/flex-box/index";
+import { FlexBox } from "@evenicanpm/storefront-core/src/components/flex-box/index";
 import {
 	H6,
 	Tiny,
-} from "@evenicanpm/storefront-core/src/components-v2/Typography";
+} from "@evenicanpm/storefront-core/src/components/Typography";
 import { getProductDetailUrl } from "@evenicanpm/storefront-core/src/lib/build-product-detail-url";
 import Add from "@mui/icons-material/Add";
 import Close from "@mui/icons-material/Close";

package/src/{components-v2 → components}/mini-cart/components/empty-view.tsx

@@ -1,7 +1,7 @@
 "use client";
 
-import { FlexBox } from "@evenicanpm/storefront-core/src/components-v2/flex-box/index";
-import { Paragraph } from "@evenicanpm/storefront-core/src/components-v2/Typography";
+import { FlexBox } from "@evenicanpm/storefront-core/src/components/flex-box/index";
+import { Paragraph } from "@evenicanpm/storefront-core/src/components/Typography";
 import { useTranslations } from "next-intl";
 import type React from "react";
 import { createContext, useContext } from "react";

package/src/{components-v2 → components}/mini-cart/components/top-header.tsx

@@ -3,8 +3,8 @@
 import {
 	FlexBetween,
 	FlexBox,
-} from "@evenicanpm/storefront-core/src/components-v2/flex-box/index";
-import { Paragraph } from "@evenicanpm/storefront-core/src/components-v2/Typography";
+} from "@evenicanpm/storefront-core/src/components/flex-box/index";
+import { Paragraph } from "@evenicanpm/storefront-core/src/components/Typography";
 import ClearIcon from "@mui/icons-material/Clear";
 import IconButton from "@mui/material/IconButton";
 import { useTranslations } from "next-intl";

package/src/{components-v2 → components}/mini-cart/index.ts

@@ -1 +1 @@
-export { default as MiniCart } from "@evenicanpm/storefront-core/src/components-v2/mini-cart/mini-cart";
+export { default as MiniCart } from "@evenicanpm/storefront-core/src/components/mini-cart/mini-cart";

package/src/{components-v2 → components}/mini-cart/mini-cart-trigger.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import type { Cart } from "@evenicanpm/storefront-core/src/api-manager/schemas/cart.schema";
-import { MiniCart } from "@evenicanpm/storefront-core/src/components-v2/mini-cart/index";
+import { MiniCart } from "@evenicanpm/storefront-core/src/components/mini-cart/index";
 import { useNotification } from "@evenicanpm/storefront-core/src/providers/notifications/use-notification";
 import { Badge, Drawer, IconButton } from "@mui/material";
 import React, { createContext, useContext, useState } from "react";
@@ -37,13 +37,11 @@ const MiniCartTrigger = ({ cart, children }: MiniCartTriggerProps) => {
 	const [open, setOpen] = useState(false);
 	const { alert } = useNotification();
 
-	const SHOULD_OPEN_MINICART_ON_ADD = true; // Move to config
-
 	React.useEffect(() => {
-		if (alert?.type === "cart" && SHOULD_OPEN_MINICART_ON_ADD) {
+		if (alert?.type === "cart") {
 			setOpen(true);
 		}
-	}, [alert, SHOULD_OPEN_MINICART_ON_ADD]);
+	}, [alert]);
 
 	return (
 		<MiniCartTriggerContext.Provider value={{ cart, open, setOpen }}>

package/src/{components-v2 → components}/mini-cart/mini-cart.tsx

@@ -2,11 +2,11 @@
 
 import useDeleteCartLine from "@evenicanpm/storefront-core/src/api-manager/services/cart/mutations/delete-cart-line";
 import useUpdateCartLines from "@evenicanpm/storefront-core/src/api-manager/services/cart/mutations/update-cart-lines";
-import BottomActions from "@evenicanpm/storefront-core/src/components-v2/mini-cart/components/bottom-actions";
-import MiniCartItem from "@evenicanpm/storefront-core/src/components-v2/mini-cart/components/cart-item";
-import EmptyCart from "@evenicanpm/storefront-core/src/components-v2/mini-cart/components/empty-view";
-import TopHeader from "@evenicanpm/storefront-core/src/components-v2/mini-cart/components/top-header";
-import Scrollbar from "@evenicanpm/storefront-core/src/components-v2/scrollbar/index";
+import BottomActions from "@evenicanpm/storefront-core/src/components/mini-cart/components/bottom-actions";
+import MiniCartItem from "@evenicanpm/storefront-core/src/components/mini-cart/components/cart-item";
+import EmptyCart from "@evenicanpm/storefront-core/src/components/mini-cart/components/empty-view";
+import TopHeader from "@evenicanpm/storefront-core/src/components/mini-cart/components/top-header";
+import Scrollbar from "@evenicanpm/storefront-core/src/components/scrollbar/index";
 import Box from "@mui/material/Box";
 import Divider from "@mui/material/Divider";
 import { useRouter } from "next/navigation";

package/src/{components-v2 → components}/mobile-navigation/MobileNavigationBar.stories.tsx

@@ -1,5 +1,5 @@
-import Home from "@evenicanpm/storefront-core/src/components-v2/icons/home";
-import User2 from "@evenicanpm/storefront-core/src/components-v2/icons/user2";
+import Home from "@evenicanpm/storefront-core/src/components/icons/home";
+import User2 from "@evenicanpm/storefront-core/src/components/icons/user2";
 import type { Meta, StoryObj } from "@storybook/react";
 import { MobileNavigationBar } from "./index";
 

package/src/{components-v2 → components}/mobile-navigation/index.ts

@@ -1,3 +1,3 @@
-import MobileNavigationBar from "@evenicanpm/storefront-core/src/components-v2/mobile-navigation/mobile-navigation-bar";
+import MobileNavigationBar from "@evenicanpm/storefront-core/src/components/mobile-navigation/mobile-navigation-bar";
 
 export { MobileNavigationBar };

package/src/{components-v2 → components}/mobile-navigation/mobile-navigation-bar.tsx

@@ -2,18 +2,18 @@
 
 // API and Context
 import getCart from "@evenicanpm/storefront-core/src/api-manager/services/cart/queries/get-cart";
-import CategoryOutlined from "@evenicanpm/storefront-core/src/components-v2/icons/category-outline";
+import CategoryOutlined from "@evenicanpm/storefront-core/src/components/icons/category-outline";
 // ICON COMPONENTS
-import Home from "@evenicanpm/storefront-core/src/components-v2/icons/home";
-import ShoppingBagOutlined from "@evenicanpm/storefront-core/src/components-v2/icons/shopping-bag-outlined";
-import User2 from "@evenicanpm/storefront-core/src/components-v2/icons/user2";
+import Home from "@evenicanpm/storefront-core/src/components/icons/home";
+import ShoppingBagOutlined from "@evenicanpm/storefront-core/src/components/icons/shopping-bag-outlined";
+import User2 from "@evenicanpm/storefront-core/src/components/icons/user2";
 // STYLED COMPONENTS
 import {
 	iconStyle,
 	StyledBox,
 	StyledNavLink,
 	Wrapper,
-} from "@evenicanpm/storefront-core/src/components-v2/mobile-navigation/styles/index";
+} from "@evenicanpm/storefront-core/src/components/mobile-navigation/styles/index";
 import { NavContext } from "@evenicanpm/storefront-core/src/providers/nav-provider";
 import type { SvgIconComponent } from "@mui/icons-material";
 import Badge from "@mui/material/Badge";

package/src/{components-v2 → components}/mobile-navigation/styles/index.ts

@@ -1,4 +1,4 @@
-import { NavLink } from "@evenicanpm/storefront-core/src/components-v2/nav-link/index";
+import { NavLink } from "@evenicanpm/storefront-core/src/components/nav-link/index";
 import { layoutConstant } from "@evenicanpm/ui";
 import Drawer from "@mui/material/Drawer";
 import styled from "@mui/material/styles/styled";
@@ -60,4 +60,4 @@ const iconStyle = {
 	justifyContent: "center",
 };
 
-export { Wrapper, StyledBox, StyledNavLink, StyledDrawer, iconStyle };
+export { iconStyle, StyledBox, StyledDrawer, StyledNavLink, Wrapper };

package/src/{components-v2 → components}/nav-link/__tests__/nav-link.test.tsx

@@ -60,7 +60,8 @@ describe("nav-link", () => {
 		);
 
 		const link = screen.getByRole("link", { name: "Products" });
-		expect(link).toHaveStyle("text-decoration: underline");
+		expect(link).toBeInTheDocument();
+		expect(link.getAttribute("style")).toContain("text-decoration");
 	});
 
 	it("renders children correctly", () => {

package/src/{components-v2 → components}/nav-link/index.ts

@@ -1,5 +1,5 @@
-import NavLink from "@evenicanpm/storefront-core/src/components-v2/nav-link/nav-link";
-import NavLink2 from "@evenicanpm/storefront-core/src/components-v2/nav-link/nav-link-2";
-import NavLink3 from "@evenicanpm/storefront-core/src/components-v2/nav-link/nav-link-3";
+import NavLink from "@evenicanpm/storefront-core/src/components/nav-link/nav-link";
+import NavLink2 from "@evenicanpm/storefront-core/src/components/nav-link/nav-link-2";
+import NavLink3 from "@evenicanpm/storefront-core/src/components/nav-link/nav-link-3";
 
 export { NavLink, NavLink2, NavLink3 };

package/src/{components-v2 → components}/nav-link/nav-link-2.tsx

@@ -1,5 +1,5 @@
 // GLOBAL CUSTOM COMPONENT
-import { Small } from "@evenicanpm/storefront-core/src/components-v2/Typography";
+import { Small } from "@evenicanpm/storefront-core/src/components/Typography";
 import Link from "next/link";
 
 // ==============================================================

package/src/{components-v2 → components}/nav-link/nav-link-3.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 // GLOBAL CUSTOM COMPONENTS
-import { Span } from "@evenicanpm/storefront-core/src/components-v2/Typography";
+import { Span } from "@evenicanpm/storefront-core/src/components/Typography";
 // MUI ICON COMPONENT
 import ArrowForward from "@mui/icons-material/ArrowForward";
 import Link from "next/link";

package/src/{components-v2 → components}/nav-link/nav-link.tsx

@@ -12,8 +12,15 @@ const StyledLink = styled(Link, {
 })<{ active: number }>(({ theme, active }) => ({
 	position: "relative",
 	transition: "color 150ms ease-in-out",
-	color: active ? theme.palette.primary.main : "inherit",
-	"&:hover": { color: `${theme.palette.primary.main} !important` },
+	color:
+		active && theme?.palette?.primary?.main
+			? theme.palette.primary.main
+			: "inherit",
+	"&:hover": {
+		color: theme?.palette?.primary?.main
+			? `${theme.palette.primary.main} !important`
+			: undefined,
+	},
 }));
 
 // ==============================================================
@@ -21,30 +28,39 @@ export interface NavLinkProps extends AnchorHTMLAttributes<HTMLAnchorElement> {
 	href: string;
 	style?: CSSProperties;
 	className?: string;
+	pathname?: string;
 }
 // ==============================================================
 
+function checkRouteMatch(pathname: string | undefined, href: string): boolean {
+	if (!pathname) return false;
+	if (href === "/") return pathname === href;
+	return pathname.includes(href);
+}
+
 export default function NavLink({
 	href,
 	children,
 	style,
 	className,
+	pathname,
 	...props
 }: Readonly<NavLinkProps>) {
-	const pathname = usePathname();
-
-	// CHECK CURRENT ROUTE
-	const checkRouteMatch = () => {
-		if (href === "/") return pathname === href;
-		return pathname?.includes(href);
-	};
+	let resolvedPathname = pathname;
+	if (resolvedPathname === undefined) {
+		try {
+			resolvedPathname = usePathname() ?? "";
+		} catch {
+			resolvedPathname = "";
+		}
+	}
 
 	return (
 		<StyledLink
 			href={href}
 			style={style}
 			className={clsx(className)}
-			active={checkRouteMatch() ? 1 : 0}
+			active={checkRouteMatch(resolvedPathname, href) ? 1 : 0}
 			{...props}
 		>
 			{children}

package/src/{components-v2 → components}/navbar/__tests__/navbar.test.tsx

@@ -5,15 +5,12 @@ vi.mock("next-intl", () => ({
 	useTranslations: () => (key: string) => key,
 }));
 
-vi.mock(
-	"@evenicanpm/storefront-core/src/components-v2/navbar/categories",
-	() => ({
-		default: () => <div data-testid="navbar-categories">Categories</div>,
-	}),
-);
+vi.mock("@evenicanpm/storefront-core/src/components/navbar/categories", () => ({
+	default: () => <div data-testid="navbar-categories">Categories</div>,
+}));
 
 vi.mock(
-	"@evenicanpm/storefront-core/src/components-v2/navbar/nav-list",
+	"@evenicanpm/storefront-core/src/components/navbar/nav-list/nav-list",
 	() => ({
 		default: () => <div data-testid="navbar-nav-list">Navigation List</div>,
 	}),

package/src/{components-v2 → components}/navbar/categories.tsx

@@ -1,10 +1,10 @@
 "use client";
 
-import CategoryMenu from "@evenicanpm/storefront-core/src/components-v2/categories/category-menu";
-import Category from "@evenicanpm/storefront-core/src/components-v2/icons/category";
-import { CategoryMenuButton } from "@evenicanpm/storefront-core/src/components-v2/navbar/styles";
+import CategoryMenu from "@evenicanpm/storefront-core/src/components/categories/category-menu";
+import Category from "@evenicanpm/storefront-core/src/components/icons/category";
+import { CategoryMenuButton } from "@evenicanpm/storefront-core/src/components/navbar/styles";
 
-import { Paragraph } from "@evenicanpm/storefront-core/src/components-v2/Typography";
+import { Paragraph } from "@evenicanpm/storefront-core/src/components/Typography";
 import { useTranslations } from "next-intl";
 import React, { createContext, type ReactNode, useContext } from "react";
 import { MdChevronRight as ChevronRight } from "react-icons/md";