@evenicanpm/storefront-core 1.8.1 → 2.0.0

package/src/{components-v2 → components}/navbar/category-based-menu/category-based-menu.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 // GLOBAL COMPONENTS
-import FlexRowCenter from "@evenicanpm/storefront-core/src/components-v2/flex-box/flex-row-center";
+import FlexRowCenter from "@evenicanpm/storefront-core/src/components/flex-box/flex-row-center";
 // STYLED COMPONENTS
 import {
 	CategoryList,
@@ -11,11 +11,11 @@ import {
 	SubCategoryList,
 	SubCategoryListItem,
 	Wrapper,
-} from "@evenicanpm/storefront-core/src/components-v2/navbar/category-based-menu/styles";
+} from "@evenicanpm/storefront-core/src/components/navbar/category-based-menu/styles";
 // LOCAL COMPONENTS
-import type { TransformedNavItem } from "@evenicanpm/storefront-core/src/components-v2/navbar/utils/transform-nav";
-import Scrollbar from "@evenicanpm/storefront-core/src/components-v2/scrollbar";
-import { H6 } from "@evenicanpm/storefront-core/src/components-v2/Typography";
+import type { TransformedNavItem } from "@evenicanpm/storefront-core/src/components/navbar/utils/transform-nav";
+import Scrollbar from "@evenicanpm/storefront-core/src/components/scrollbar";
+import { H6 } from "@evenicanpm/storefront-core/src/components/Typography";
 import useSettings from "@evenicanpm/storefront-core/src/hooks/use-settings";
 import ChevronRight from "@mui/icons-material/ChevronRight";
 import KeyboardArrowDown from "@mui/icons-material/KeyboardArrowDown";

package/src/components/navbar/category-based-menu/index.ts

@@ -0,0 +1 @@
+export { default } from "@evenicanpm/storefront-core/src/components/navbar/category-based-menu/category-based-menu";

package/src/{components-v2 → components}/navbar/category-based-menu/styles.ts

@@ -1,5 +1,5 @@
 // LOCAL CUSTOM COMPONENT
-import BazaarCard from "@evenicanpm/storefront-core/src/components-v2/BazaarCard";
+import BazaarCard from "@evenicanpm/storefront-core/src/components/BazaarCard";
 import getPaletteColor from "@evenicanpm/storefront-core/src/lib/get-palette-color";
 import List from "@mui/material/List";
 import ListItem from "@mui/material/ListItem";
@@ -71,11 +71,11 @@ const SubCategoryListItem = styled(ListItem)(({ theme }) => ({
 }));
 
 export {
-	Wrapper,
-	StyledCard,
 	CategoryList,
+	CategoryListItem,
 	MenusContainer,
+	StyledCard,
 	SubCategoryList,
-	CategoryListItem,
 	SubCategoryListItem,
+	Wrapper,
 };

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

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

package/src/components/navbar/mega-menu/index.ts

@@ -0,0 +1 @@
+export { default } from "@evenicanpm/storefront-core/src/components/navbar/mega-menu/mega-menu";

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

@@ -1,15 +1,15 @@
 "use client";
 
 // GLOBAL COMPONENTS
-import FlexRowCenter from "@evenicanpm/storefront-core/src/components-v2/flex-box/flex-row-center";
+import FlexRowCenter from "@evenicanpm/storefront-core/src/components/flex-box/flex-row-center";
 // STYLED
 import {
 	MenuListItem,
 	MenusContainer,
 	StyledNavLink,
 	Wrapper,
-} from "@evenicanpm/storefront-core/src/components-v2/navbar/mega-menu/styles";
-import { H6 } from "@evenicanpm/storefront-core/src/components-v2/Typography";
+} from "@evenicanpm/storefront-core/src/components/navbar/mega-menu/styles";
+import { H6 } from "@evenicanpm/storefront-core/src/components/Typography";
 // HOOKS
 import useOverflowDetect from "@evenicanpm/storefront-core/src/hooks/use-overflow-detect";
 import KeyboardArrowDown from "@mui/icons-material/KeyboardArrowDown";

package/src/{components-v2 → components}/navbar/mega-menu/styles.ts

@@ -1,5 +1,5 @@
 // GLOBAL CUSTOM COMPONENTS
-import { NavLink } from "@evenicanpm/storefront-core/src/components-v2/nav-link/index";
+import { NavLink } from "@evenicanpm/storefront-core/src/components/nav-link/index";
 import ListItem from "@mui/material/ListItem";
 import styled from "@mui/material/styles/styled";
 

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

@@ -1 +1 @@
-export { default as MobileMenu } from "@evenicanpm/storefront-core/src/components-v2/navbar/mobile-menu/mobile-menu";
+export { default as MobileMenu } from "@evenicanpm/storefront-core/src/components/navbar/mobile-menu/mobile-menu";

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

@@ -1,5 +1,5 @@
-import MobileMenu from "@evenicanpm/storefront-core/src/components-v2/navbar/mobile-menu/mobile-menu";
-import { transformCmsNav } from "@evenicanpm/storefront-core/src/components-v2/navbar/utils/transform-nav";
+import MobileMenu from "@evenicanpm/storefront-core/src/components/navbar/mobile-menu/mobile-menu";
+import { transformCmsNav } from "@evenicanpm/storefront-core/src/components/navbar/utils/transform-nav";
 import { fireEvent, render, screen } from "@testing-library/react";
 import { beforeEach, describe, it, vi } from "vitest";
 import type { CmsNavItem } from "@/cms/interfaces/navigation";

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

@@ -1,9 +1,9 @@
 "use client";
 
-import { NavLink } from "@evenicanpm/storefront-core/src/components-v2/nav-link";
-import type { TransformedNavItem } from "@evenicanpm/storefront-core/src/components-v2/navbar/utils/transform-nav";
-import Scrollbar from "@evenicanpm/storefront-core/src/components-v2/scrollbar";
-import { H6 } from "@evenicanpm/storefront-core/src/components-v2/Typography";
+import { NavLink } from "@evenicanpm/storefront-core/src/components/nav-link";
+import type { TransformedNavItem } from "@evenicanpm/storefront-core/src/components/navbar/utils/transform-nav";
+import Scrollbar from "@evenicanpm/storefront-core/src/components/scrollbar";
+import { H6 } from "@evenicanpm/storefront-core/src/components/Typography";
 import { NavContext } from "@evenicanpm/storefront-core/src/providers/nav-provider";
 import Accordion from "@mui/material/Accordion";
 import AccordionSummary from "@mui/material/AccordionSummary";

package/src/{components-v2 → components}/navbar/nav-list/cms-nav.test.tsx

@@ -1,4 +1,4 @@
-import NavCms from "@evenicanpm/storefront-core/src/components-v2/navbar/nav-list/index";
+import NavCms from "@evenicanpm/storefront-core/src/components/navbar/nav-list/index";
 import { NavContext } from "@evenicanpm/storefront-core/src/providers/nav-provider";
 import { render, screen } from "@testing-library/react";
 import React from "react";

package/src/components/navbar/nav-list/index.ts

@@ -0,0 +1 @@
+export { default } from "@evenicanpm/storefront-core/src/components/navbar/nav-list/nav-list";

package/src/{components-v2 → components}/navbar/nav-list/nav-item-child.tsx

@@ -1,14 +1,14 @@
 "use client";
 
-import BazaarCard from "@evenicanpm/storefront-core/src/components-v2/BazaarCard";
+import BazaarCard from "@evenicanpm/storefront-core/src/components/BazaarCard";
 // STYLED COMPONENTS
 import {
 	ParentNav,
 	ParentNavItem,
-} from "@evenicanpm/storefront-core/src/components-v2/navbar/styles";
-import type { TransformedNavItem } from "@evenicanpm/storefront-core/src/components-v2/navbar/utils/transform-nav";
+} from "@evenicanpm/storefront-core/src/components/navbar/styles";
+import type { TransformedNavItem } from "@evenicanpm/storefront-core/src/components/navbar/utils/transform-nav";
 // GLOBAL CUSTOM COMPONENTS
-import { Span } from "@evenicanpm/storefront-core/src/components-v2/Typography";
+import { Span } from "@evenicanpm/storefront-core/src/components/Typography";
 // GLOBAL CUSTOM HOOKS
 import useOverflowDetect from "@evenicanpm/storefront-core/src/hooks/use-overflow-detect";
 import useSettings from "@evenicanpm/storefront-core/src/hooks/use-settings";

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

@@ -1,20 +1,20 @@
 "use client";
 
-import BazaarCard from "@evenicanpm/storefront-core/src/components-v2/BazaarCard";
-import { FlexBox } from "@evenicanpm/storefront-core/src/components-v2/flex-box";
-import { NavLink } from "@evenicanpm/storefront-core/src/components-v2/nav-link";
-import CategoryBasedMenu from "@evenicanpm/storefront-core/src/components-v2/navbar/category-based-menu";
-import MegaMenu from "@evenicanpm/storefront-core/src/components-v2/navbar/mega-menu";
-import NavItemChild from "@evenicanpm/storefront-core/src/components-v2/navbar/nav-list/nav-item-child";
+import BazaarCard from "@evenicanpm/storefront-core/src/components/BazaarCard";
+import { FlexBox } from "@evenicanpm/storefront-core/src/components/flex-box";
+import { NavLink } from "@evenicanpm/storefront-core/src/components/nav-link";
+import CategoryBasedMenu from "@evenicanpm/storefront-core/src/components/navbar/category-based-menu";
+import MegaMenu from "@evenicanpm/storefront-core/src/components/navbar/mega-menu";
+import NavItemChild from "@evenicanpm/storefront-core/src/components/navbar/nav-list/nav-item-child";
 import {
 	ChildNavListWrapper,
 	NAV_LINK_STYLES,
 	StyledNavLink,
-} from "@evenicanpm/storefront-core/src/components-v2/navbar/styles";
+} from "@evenicanpm/storefront-core/src/components/navbar/styles";
 import {
 	type TransformedNavItem,
 	transformCmsNav,
-} from "@evenicanpm/storefront-core/src/components-v2/navbar/utils/transform-nav";
+} from "@evenicanpm/storefront-core/src/components/navbar/utils/transform-nav";
 import { NavContext } from "@evenicanpm/storefront-core/src/providers/nav-provider";
 import KeyboardArrowDown from "@mui/icons-material/KeyboardArrowDown";
 import MenuItem from "@mui/material/MenuItem";

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

@@ -1,13 +1,13 @@
 "use client";
 
 // LOCAL CUSTOM COMPONENTS
-import Categories from "@evenicanpm/storefront-core/src/components-v2/navbar/categories";
-import NavigationList from "@evenicanpm/storefront-core/src/components-v2/navbar/nav-list/index";
+import Categories from "@evenicanpm/storefront-core/src/components/navbar/categories";
+import NavigationList from "@evenicanpm/storefront-core/src/components/navbar/nav-list/index";
 // STYLED COMPONENTS
 import {
 	InnerContainer,
 	NavBarWrapper,
-} from "@evenicanpm/storefront-core/src/components-v2/navbar/styles";
+} from "@evenicanpm/storefront-core/src/components/navbar/styles";
 import type React from "react";
 import { createContext, useContext } from "react";
 

package/src/{components-v2 → components}/navbar/styles.ts

@@ -1,6 +1,6 @@
-import BazaarCard from "@evenicanpm/storefront-core/src/components-v2/BazaarCard";
+import BazaarCard from "@evenicanpm/storefront-core/src/components/BazaarCard";
 // GLOBAL CUSTOM COMPONENTS
-import { NavLink } from "@evenicanpm/storefront-core/src/components-v2/nav-link/index";
+import { NavLink } from "@evenicanpm/storefront-core/src/components/nav-link/index";
 import Box from "@mui/material/Box";
 import Button from "@mui/material/Button";
 import Container from "@mui/material/Container";

package/src/{components-v2 → components}/navbar/utils/transform-nav.test.ts

@@ -1,7 +1,7 @@
 import {
 	transformCategoryNav,
 	transformCmsNav,
-} from "@evenicanpm/storefront-core/src/components-v2/navbar/utils/transform-nav";
+} from "@evenicanpm/storefront-core/src/components/navbar/utils/transform-nav";
 import type { CategoryHierarchy } from "@evenicanpm/storefront-core/src/lib/category-helpers";
 import { describe, expect, it } from "vitest";
 import type { CmsNavItem } from "@/cms/interfaces/navigation";

package/src/{components-v2 → components}/no-records.tsx

@@ -1,4 +1,4 @@
-import { H4 } from "@evenicanpm/storefront-core/src/components-v2/Typography";
+import { H4 } from "@evenicanpm/storefront-core/src/components/Typography";
 import { Box } from "@mui/material";
 import { useTranslations } from "next-intl";
 import React from "react";

package/src/{components-v2/navbar/nav-list → components/product-cards/product-card}/index.ts

@@ -1 +1 @@
-export { default } from "@evenicanpm/storefront-core/src/components-v2/navbar/nav-list/nav-list";
+export { default } from "@evenicanpm/storefront-core/src/components/product-cards/product-card/product-card";

package/src/{components-v2 → components}/product-cards/product-card/product-card.tsx

@@ -11,25 +11,25 @@ import useAddToCart from "@evenicanpm/storefront-core/src/api-manager/services/c
 import useRemoveFromWishlist from "@evenicanpm/storefront-core/src/api-manager/services/user/mutations/remove-from-wishlist";
 import useUpdateWishlist from "@evenicanpm/storefront-core/src/api-manager/services/user/mutations/update-wishlist";
 import { WISHLIST_DETAILS_QUERY_KEY } from "@evenicanpm/storefront-core/src/api-manager/services/user/queries/get-wishlist-details";
-import { FlexBox } from "@evenicanpm/storefront-core/src/components-v2/flex-box";
+import { FlexBox } from "@evenicanpm/storefront-core/src/components/flex-box";
 // GLOBAL CUSTOM COMPONENTS
-import LazyImage from "@evenicanpm/storefront-core/src/components-v2/LazyImage";
-import DiscountChip from "@evenicanpm/storefront-core/src/components-v2/product-cards/discount-chip";
-import FavoriteButton from "@evenicanpm/storefront-core/src/components-v2/product-cards/favorite-button";
+import LazyImage from "@evenicanpm/storefront-core/src/components/LazyImage";
+import DiscountChip from "@evenicanpm/storefront-core/src/components/product-cards/discount-chip";
+import FavoriteButton from "@evenicanpm/storefront-core/src/components/product-cards/favorite-button";
 // STYLED COMPONENTS
 import {
 	ContentWrapper,
 	HoverIconWrapper,
 	ImageWrapper,
 	StyledBazaarCard,
-} from "@evenicanpm/storefront-core/src/components-v2/product-cards/product-card/styles/index";
+} from "@evenicanpm/storefront-core/src/components/product-cards/product-card/styles/index";
 // LOCAL CUSTOM COMPONENTS
-import ProductPrice from "@evenicanpm/storefront-core/src/components-v2/product-cards/product-price";
-import ProductTitle from "@evenicanpm/storefront-core/src/components-v2/product-cards/product-title";
-import QuantityBtns from "@evenicanpm/storefront-core/src/components-v2/product-cards/quantity-buttons";
-import ProductViewDialog from "@evenicanpm/storefront-core/src/components-v2/product-dialog";
-import { Span } from "@evenicanpm/storefront-core/src/components-v2/Typography";
-import AddToWishlistDialog from "@evenicanpm/storefront-core/src/components-v2/wishlist-dialogs/add-to-wishlist";
+import ProductPrice from "@evenicanpm/storefront-core/src/components/product-cards/product-price";
+import ProductTitle from "@evenicanpm/storefront-core/src/components/product-cards/product-title";
+import QuantityBtns from "@evenicanpm/storefront-core/src/components/product-cards/quantity-buttons";
+import ProductViewDialog from "@evenicanpm/storefront-core/src/components/product-dialog";
+import { Span } from "@evenicanpm/storefront-core/src/components/Typography";
+import AddToWishlistDialog from "@evenicanpm/storefront-core/src/components/wishlist-dialogs/add-to-wishlist";
 import useFavorite from "@evenicanpm/storefront-core/src/hooks/use-favorite";
 // LIBRARY AND HOOKS
 import buildDetailUrl from "@evenicanpm/storefront-core/src/lib/build-detail-url";

package/src/{components-v2 → components}/product-cards/product-card/styles/index.ts

@@ -1,5 +1,5 @@
 // GLOBAL CUSTOM COMPONENT
-import BazaarCard from "@evenicanpm/storefront-core/src/components-v2/BazaarCard";
+import BazaarCard from "@evenicanpm/storefront-core/src/components/BazaarCard";
 import styled from "@mui/material/styles/styled";
 import type { StyledComponent } from "@mui/styled-engine";
 

package/src/{components-v2/categories/category-list → components/product-cards/product-card-plp}/index.ts

@@ -1 +1 @@
-export { default } from "@evenicanpm/storefront-core/src/components-v2/categories/category-list/category-list";
+export { default } from "@evenicanpm/storefront-core/src/components/product-cards/product-card-plp/product-card";

package/src/{components-v2 → components}/product-cards/product-card-plp/product-card.tsx

@@ -1,21 +1,21 @@
 import {
 	FlexBetween,
 	FlexBox,
-} from "@evenicanpm/storefront-core/src/components-v2/flex-box/index";
-import ImageWithFallback from "@evenicanpm/storefront-core/src/components-v2/ImageWithFallback";
+} from "@evenicanpm/storefront-core/src/components/flex-box/index";
+import ImageWithFallback from "@evenicanpm/storefront-core/src/components/ImageWithFallback";
 // LOCAL CUSTOM COMPONENTS
-import DiscountChip from "@evenicanpm/storefront-core/src/components-v2/product-cards/discount-chip";
-import FavoriteButton from "@evenicanpm/storefront-core/src/components-v2/product-cards/favorite-button";
+import DiscountChip from "@evenicanpm/storefront-core/src/components/product-cards/discount-chip";
+import FavoriteButton from "@evenicanpm/storefront-core/src/components/product-cards/favorite-button";
 // STYLED COMPONENTS
 import {
 	HoverIconWrapper,
 	PriceText,
-} from "@evenicanpm/storefront-core/src/components-v2/product-cards/product-card-plp/styles/index";
-import QuantityButtons from "@evenicanpm/storefront-core/src/components-v2/product-cards/quantity-buttons";
-import ProductViewDialog from "@evenicanpm/storefront-core/src/components-v2/product-dialog";
+} from "@evenicanpm/storefront-core/src/components/product-cards/product-card-plp/styles/index";
+import QuantityButtons from "@evenicanpm/storefront-core/src/components/product-cards/quantity-buttons";
+import ProductViewDialog from "@evenicanpm/storefront-core/src/components/product-dialog";
 // GLOBAL CUSTOM COMPONENTS
-import { H6 } from "@evenicanpm/storefront-core/src/components-v2/Typography";
-import AddToWishlistDialog from "@evenicanpm/storefront-core/src/components-v2/wishlist-dialogs/add-to-wishlist";
+import { H6 } from "@evenicanpm/storefront-core/src/components/Typography";
+import AddToWishlistDialog from "@evenicanpm/storefront-core/src/components/wishlist-dialogs/add-to-wishlist";
 import useCart from "@evenicanpm/storefront-core/src/hooks/use-cart";
 import useFavorite from "@evenicanpm/storefront-core/src/hooks/use-favorite";
 import buildDetailUrl from "@evenicanpm/storefront-core/src/lib/build-detail-url";

package/src/components/product-cards/product-card-plp-list/index.ts

@@ -0,0 +1 @@
+export { default as ProductCardPlpList } from "@evenicanpm/storefront-core/src/components/product-cards/product-card-plp-list/product-card";

package/src/{components-v2 → components}/product-cards/product-card-plp-list/product-card.tsx

@@ -1,14 +1,14 @@
-import ImageWithFallback from "@evenicanpm/storefront-core/src/components-v2/ImageWithFallback";
+import ImageWithFallback from "@evenicanpm/storefront-core/src/components/ImageWithFallback";
 // LOCAL CUSTOM COMPONENTS
-import DiscountChip from "@evenicanpm/storefront-core/src/components-v2/product-cards/discount-chip";
-import FavoriteButton from "@evenicanpm/storefront-core/src/components-v2/product-cards/favorite-button";
-import ProductTags from "@evenicanpm/storefront-core/src/components-v2/product-cards/product-card-plp-list/components/tags";
-import ProductPrice from "@evenicanpm/storefront-core/src/components-v2/product-cards/product-price";
-import QuantityButtons from "@evenicanpm/storefront-core/src/components-v2/product-cards/quantity-buttons";
-import ProductViewDialog from "@evenicanpm/storefront-core/src/components-v2/product-dialog";
+import DiscountChip from "@evenicanpm/storefront-core/src/components/product-cards/discount-chip";
+import FavoriteButton from "@evenicanpm/storefront-core/src/components/product-cards/favorite-button";
+import ProductTags from "@evenicanpm/storefront-core/src/components/product-cards/product-card-plp-list/components/tags";
+import ProductPrice from "@evenicanpm/storefront-core/src/components/product-cards/product-price";
+import QuantityButtons from "@evenicanpm/storefront-core/src/components/product-cards/quantity-buttons";
+import ProductViewDialog from "@evenicanpm/storefront-core/src/components/product-dialog";
 // GLOBAL CUSTOM COMPONENTS
-import { H5 } from "@evenicanpm/storefront-core/src/components-v2/Typography";
-import AddToWishlistDialog from "@evenicanpm/storefront-core/src/components-v2/wishlist-dialogs/add-to-wishlist";
+import { H5 } from "@evenicanpm/storefront-core/src/components/Typography";
+import AddToWishlistDialog from "@evenicanpm/storefront-core/src/components/wishlist-dialogs/add-to-wishlist";
 import useCart from "@evenicanpm/storefront-core/src/hooks/use-cart";
 import useFavorite from "@evenicanpm/storefront-core/src/hooks/use-favorite";
 // LIBRARY AND HOOKS

package/src/components/product-cards/product-card-search/index.ts

@@ -0,0 +1 @@
+export { default } from "@evenicanpm/storefront-core/src/components/product-cards/product-card-search/product-card";

package/src/{components-v2 → components}/product-cards/product-card-search/product-card.tsx

@@ -1,22 +1,22 @@
 "use client";
 
-import { FlexRowCenter } from "@evenicanpm/storefront-core/src/components-v2/flex-box";
+import { FlexRowCenter } from "@evenicanpm/storefront-core/src/components/flex-box";
 // GLOBAL CUSTOM COMPONENTS
-import LazyImage from "@evenicanpm/storefront-core/src/components-v2/LazyImage";
-import FavoriteButton from "@evenicanpm/storefront-core/src/components-v2/product-cards/favorite-button";
+import LazyImage from "@evenicanpm/storefront-core/src/components/LazyImage";
+import FavoriteButton from "@evenicanpm/storefront-core/src/components/product-cards/favorite-button";
 // STYLED COMPONENTS
 import {
 	Card,
 	CardMedia,
 	QuickViewSmallButton,
-} from "@evenicanpm/storefront-core/src/components-v2/product-cards/product-card-search/styles/index";
-import ProductViewDialog from "@evenicanpm/storefront-core/src/components-v2/product-dialog";
+} from "@evenicanpm/storefront-core/src/components/product-cards/product-card-search/styles/index";
+import ProductViewDialog from "@evenicanpm/storefront-core/src/components/product-dialog";
 import {
 	H4,
 	Paragraph,
 	Small,
-} from "@evenicanpm/storefront-core/src/components-v2/Typography";
-import AddToWishlistDialog from "@evenicanpm/storefront-core/src/components-v2/wishlist-dialogs/add-to-wishlist";
+} from "@evenicanpm/storefront-core/src/components/Typography";
+import AddToWishlistDialog from "@evenicanpm/storefront-core/src/components/wishlist-dialogs/add-to-wishlist";
 import useFavorite from "@evenicanpm/storefront-core/src/hooks/use-favorite";
 // LIBRARY AND HOOKS
 import buildDetailUrl from "@evenicanpm/storefront-core/src/lib/build-detail-url";

package/src/{components-v2 → components}/product-cards/product-price.tsx

@@ -1,6 +1,6 @@
 // GLOBAL CUSTOM COMPONENTS
-import FlexBox from "@evenicanpm/storefront-core/src/components-v2/flex-box/flex-box";
-import { Paragraph } from "@evenicanpm/storefront-core/src/components-v2/Typography";
+import FlexBox from "@evenicanpm/storefront-core/src/components/flex-box/flex-box";
+import { Paragraph } from "@evenicanpm/storefront-core/src/components/Typography";
 // CUSTOM UTILS LIBRARY FUNCTIONS
 import {
 	calculateDiscount,

package/src/{components-v2 → components}/product-cards/product-rating.tsx

@@ -1,6 +1,6 @@
-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";
 // GLOBAL CUSTOM COMPONENTS
-import { Span } from "@evenicanpm/storefront-core/src/components-v2/Typography";
+import { Span } from "@evenicanpm/storefront-core/src/components/Typography";
 import type { BoxProps } from "@mui/material/Box";
 import Rating from "@mui/material/Rating";
 

package/src/{components-v2 → components}/product-cards/product-title.tsx

@@ -1,4 +1,4 @@
-import { H3 } from "@evenicanpm/storefront-core/src/components-v2/Typography";
+import { H3 } from "@evenicanpm/storefront-core/src/components/Typography";
 import Link from "next/link";
 
 // ==============================================================

package/src/{components-v2 → components}/product-cards/quantity-buttons.tsx

@@ -1,6 +1,6 @@
 // GLOBAL CUSTOM COMPONENTS
-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";
 // MUI ICON COMPONENTS
 import Add from "@mui/icons-material/Add";
 import Remove from "@mui/icons-material/Remove";

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

@@ -32,7 +32,7 @@ vi.mock(
 );
 
 vi.mock(
-	"@evenicanpm/storefront-core/src/components-v2/product-dialog/compound/product-dialog",
+	"@evenicanpm/storefront-core/src/components/product-dialog/compound/product-dialog",
 	() => ({
 		default: Object.assign(
 			({

package/src/{components-v2 → components}/product-dialog/compound/product-dialog.tsx

@@ -4,16 +4,16 @@
 "use client";
 import type { ProductDetails } from "@evenicanpm/storefront-core/src/api-manager/schemas/product.schema";
 import getProductById from "@evenicanpm/storefront-core/src/api-manager/services/product/queries/get-product-by-id";
-import BazaarImage from "@evenicanpm/storefront-core/src/components-v2/BazaarImage";
-import { Carousel } from "@evenicanpm/storefront-core/src/components-v2/carousel";
-import { FlexBox } from "@evenicanpm/storefront-core/src/components-v2/flex-box";
-import QuantityVariantsSelect from "@evenicanpm/storefront-core/src/components-v2/product-quantity-variants";
+import BazaarImage from "@evenicanpm/storefront-core/src/components/BazaarImage";
+import { Carousel } from "@evenicanpm/storefront-core/src/components/carousel";
+import { FlexBox } from "@evenicanpm/storefront-core/src/components/flex-box";
+import QuantityVariantsSelect from "@evenicanpm/storefront-core/src/components/product-quantity-variants";
 import {
 	H1,
 	H2,
 	H6,
 	Paragraph,
-} from "@evenicanpm/storefront-core/src/components-v2/Typography";
+} from "@evenicanpm/storefront-core/src/components/Typography";
 import { currency } from "@evenicanpm/storefront-core/src/lib/lib";
 import Close from "@mui/icons-material/Close";
 import Dialog from "@mui/material/Dialog";

package/src/{components-v2 → components}/product-dialog/index.tsx

@@ -1,5 +1,5 @@
 "use client";
-import ProductViewDialog from "@evenicanpm/storefront-core/src/components-v2/product-dialog/compound/product-dialog";
+import ProductViewDialog from "@evenicanpm/storefront-core/src/components/product-dialog/compound/product-dialog";
 
 interface Props {
 	productId: number;

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

@@ -1,15 +1,15 @@
+import type { ProductDimensionValueInventoryAvailability } from "@msdyn365-commerce/retail-proxy";
 import { render } from "@testing-library/react";
 import type { ReactNode } from "react";
 import { vi } from "vitest";
 import ProductDimensions from "../index";
-import type { ProductDimensionValueInventoryAvailability } from "@msdyn365-commerce/retail-proxy";
 
 vi.mock("next-intl", () => ({
 	useTranslations: () => (key: string) => key,
 }));
 
 vi.mock(
-	"@evenicanpm/storefront-core/src/components-v2/product-dimensions/compound/dimensions",
+	"@evenicanpm/storefront-core/src/components/product-dimensions/compound/dimensions",
 	() => ({
 		Dimensions: Object.assign(
 			({ children }: { children: ReactNode }) => (

package/src/{components-v2 → components}/product-dimensions/compound/dimensions-group-error.tsx

@@ -2,10 +2,10 @@
  * @module ProductDimensions
  */
 "use client";
-import { DimensionsContext } from "@evenicanpm/storefront-core/src/components-v2/product-dimensions/compound/dimensions";
-import { DimensionsGroupContext } from "@evenicanpm/storefront-core/src/components-v2/product-dimensions/compound/dimensions-group";
-import { hasSelectedDimension } from "@evenicanpm/storefront-core/src/components-v2/product-dimensions/utils/has-selected-dimension";
-import { H6 } from "@evenicanpm/storefront-core/src/components-v2/Typography";
+import { DimensionsContext } from "@evenicanpm/storefront-core/src/components/product-dimensions/compound/dimensions";
+import { DimensionsGroupContext } from "@evenicanpm/storefront-core/src/components/product-dimensions/compound/dimensions-group";
+import { hasSelectedDimension } from "@evenicanpm/storefront-core/src/components/product-dimensions/utils/has-selected-dimension";
+import { H6 } from "@evenicanpm/storefront-core/src/components/Typography";
 import { ProductDimensionType } from "@msdyn365-commerce/retail-proxy";
 import { useTranslations } from "next-intl";
 import { useContext } from "react";

package/src/{components-v2 → components}/product-dimensions/compound/dimensions-group-label.tsx

@@ -2,8 +2,8 @@
  * @module ProductDimensions
  */
 "use client";
-import { DimensionsGroupContext } from "@evenicanpm/storefront-core/src/components-v2/product-dimensions/compound/dimensions-group";
-import { H6 } from "@evenicanpm/storefront-core/src/components-v2/Typography";
+import { DimensionsGroupContext } from "@evenicanpm/storefront-core/src/components/product-dimensions/compound/dimensions-group";
+import { H6 } from "@evenicanpm/storefront-core/src/components/Typography";
 import { ProductDimensionType } from "@msdyn365-commerce/retail-proxy";
 import { useContext } from "react";
 

package/src/{components-v2 → components}/product-dimensions/compound/dimensions-group-list-chip.tsx

@@ -2,7 +2,7 @@
  * @module ProductDimensions
  */
 
-import { DimensionsContext } from "@evenicanpm/storefront-core/src/components-v2/product-dimensions/compound/dimensions";
+import { DimensionsContext } from "@evenicanpm/storefront-core/src/components/product-dimensions/compound/dimensions";
 import {
 	ProductDimensionType,
 	type ProductDimensionValueInventoryAvailability,

package/src/{components-v2 → components}/product-dimensions/compound/dimensions-group-list.tsx

@@ -2,8 +2,8 @@
  * @module ProductDimensions
  */
 "use client";
-import { DimensionsGroupContext } from "@evenicanpm/storefront-core/src/components-v2/product-dimensions/compound/dimensions-group";
-import { DimensionGroupListChip } from "@evenicanpm/storefront-core/src/components-v2/product-dimensions/compound/dimensions-group-list-chip";
+import { DimensionsGroupContext } from "@evenicanpm/storefront-core/src/components/product-dimensions/compound/dimensions-group";
+import { DimensionGroupListChip } from "@evenicanpm/storefront-core/src/components/product-dimensions/compound/dimensions-group-list-chip";
 import { useContext } from "react";
 
 /**

package/src/{components-v2 → components}/product-dimensions/compound/dimensions-group.tsx

@@ -2,9 +2,9 @@
  * @module ProductDimensions
  */
 "use client";
-import { DimensionGroupError } from "@evenicanpm/storefront-core/src/components-v2/product-dimensions/compound/dimensions-group-error";
-import { DimensionGroupLabel } from "@evenicanpm/storefront-core/src/components-v2/product-dimensions/compound/dimensions-group-label";
-import { DimensionGroupList } from "@evenicanpm/storefront-core/src/components-v2/product-dimensions/compound/dimensions-group-list";
+import { DimensionGroupError } from "@evenicanpm/storefront-core/src/components/product-dimensions/compound/dimensions-group-error";
+import { DimensionGroupLabel } from "@evenicanpm/storefront-core/src/components/product-dimensions/compound/dimensions-group-label";
+import { DimensionGroupList } from "@evenicanpm/storefront-core/src/components/product-dimensions/compound/dimensions-group-list";
 import type { ProductDimensionValueInventoryAvailability } from "@msdyn365-commerce/retail-proxy";
 import Box from "@mui/material/Box";
 import { createContext, type PropsWithChildren } from "react";

package/src/{components-v2 → components}/product-dimensions/compound/dimensions.tsx

@@ -1,5 +1,5 @@
 "use client";
-import { DimensionGroup } from "@evenicanpm/storefront-core/src/components-v2/product-dimensions/compound/dimensions-group";
+import { DimensionGroup } from "@evenicanpm/storefront-core/src/components/product-dimensions/compound/dimensions-group";
 import type { ProductDimensionValueInventoryAvailability } from "@msdyn365-commerce/retail-proxy";
 import React, {
 	createContext,

package/src/{components-v2 → components}/product-dimensions/index.tsx

@@ -1,5 +1,5 @@
 "use client";
-import { Dimensions } from "@evenicanpm/storefront-core/src/components-v2/product-dimensions/compound/dimensions";
+import { Dimensions } from "@evenicanpm/storefront-core/src/components/product-dimensions/compound/dimensions";
 import type { ProductDimensionValueInventoryAvailability } from "@msdyn365-commerce/retail-proxy";
 
 // When selecting a single dimension, loading spinner starts... not necessary, inefficient.

package/src/{components-v2 → components}/product-quantity-buttons/__tests__/product-quantity-buttons.test.tsx

@@ -7,8 +7,17 @@ vi.mock("next-intl", () => ({
 	useTranslations: () => (key: string) => key,
 }));
 
+vi.mock("@evenicanpm/storefront-core/src/hooks/use-cart", () => ({
+	default: vi.fn(() => ({
+		handleAddToCart: vi.fn(),
+		handleCartAmountChange: vi.fn(),
+		loading: false,
+		currentCartLine: { Quantity: 1 } as any,
+	})),
+}));
+
 vi.mock(
-	"@evenicanpm/storefront-core/src/components-v2/product-quantity-buttons/compound/quantity-buttons-root",
+	"@evenicanpm/storefront-core/src/components/product-quantity-buttons/compound/quantity-buttons-root",
 	() => ({
 		QuantityButtons: Object.assign(
 			({ children }: { children: ReactNode }) => (

package/src/{components-v2 → components}/product-quantity-buttons/compound/quantity-buttons-root.tsx

@@ -2,8 +2,8 @@
  * @module ProductQuantityButtons
  */
 
-import { FlexBox } from "@evenicanpm/storefront-core/src/components-v2/flex-box";
-import { H3 } from "@evenicanpm/storefront-core/src/components-v2/Typography";
+import { FlexBox } from "@evenicanpm/storefront-core/src/components/flex-box";
+import { H3 } from "@evenicanpm/storefront-core/src/components/Typography";
 import useCart from "@evenicanpm/storefront-core/src/hooks/use-cart";
 import type { CartLine } from "@msdyn365-commerce/retail-proxy";
 import Button from "@mui/material/Button";