Reordering

README.md

@@ -97,17 +97,30 @@ People actively working on this project: @okbel & @lfades.
 
 ## Framework
 
-Framework is where the data comes from. Contains mostly hooks and functions.
+Framework is where the data comes from. It contains mostly hooks and functions.
 
 ## Structure
 
-- ## product
-- wishlist
+Main folder and its exposed functions
+
+- `product`
+  - usePrice
+  - useSearch
+- `wishlist`
   - useWishlist
   - addWishlistItem
   - removeWishlistItem
-- auth
+- `auth`
+  - useLogin
+  - useLogout
+  - useSignup
+- `cart`
 
-- config.json
+  - useCart
+  - useAddItem
+  - useRemoveItem
+  - useCartActions
+  - useUpdateItem
 
-## Wishlist
+- `config.json`
+- README.md

components/auth/LoginView.tsx

@@ -1,6 +1,6 @@
 import { FC, useEffect, useState, useCallback } from 'react'
 import { Logo, Button, Input } from '@components/ui'
-import useLogin from '@framework/use-login'
+import useLogin from '@framework/auth/use-login'
 import { useUI } from '@components/ui/context'
 import { validate } from 'email-validator'
 

components/auth/SignUpView.tsx

@@ -3,7 +3,7 @@ import { validate } from 'email-validator'
 import { Info } from '@components/icons'
 import { useUI } from '@components/ui/context'
 import { Logo, Button, Input } from '@components/ui'
-import useSignup from '@framework/use-signup'
+import useSignup from '@framework/auth/use-signup'
 
 interface Props {}
 

components/cart/CartItem/CartItem.tsx

@@ -3,7 +3,7 @@ import cn from 'classnames'
 import Image from 'next/image'
 import Link from 'next/link'
 import { Trash, Plus, Minus } from '@components/icons'
-import usePrice from '@framework/use-price'
+import usePrice from '@framework/product/use-price'
 import useUpdateItem from '@framework/cart/use-update-item'
 import useRemoveItem from '@framework/cart/use-remove-item'
 import s from './CartItem.module.css'

components/cart/CartSidebarView/CartSidebarView.tsx

@@ -5,7 +5,7 @@ import { Button } from '@components/ui'
 import { Bag, Cross, Check } from '@components/icons'
 import { useUI } from '@components/ui/context'
 import useCart from '@framework/cart/use-cart'
-import usePrice from '@framework/use-price'
+import usePrice from '@framework/product/use-price'
 import CartItem from '../CartItem'
 import s from './CartSidebarView.module.css'
 

components/common/UserNav/DropdownMenu.tsx

@@ -15,7 +15,7 @@ import {
   clearAllBodyScrollLocks,
 } from 'body-scroll-lock'
 
-import useLogout from '@framework/use-logout'
+import useLogout from '@framework/auth/use-logout'
 
 interface DropdownMenuProps {
   open?: boolean

components/common/UserNav/UserNav.tsx

@@ -2,7 +2,7 @@ import { FC } from 'react'
 import Link from 'next/link'
 import cn from 'classnames'
 import useCart from '@framework/cart/use-cart'
-import useCustomer from '@framework/use-customer'
+import useCustomer from '@framework/customer/use-customer'
 import { Heart, Bag } from '@components/icons'
 import { useUI } from '@components/ui/context'
 import DropdownMenu from './DropdownMenu'

components/product/ProductCard/ProductCard.tsx

@@ -5,7 +5,7 @@ import type { FC } from 'react'
 import s from './ProductCard.module.css'
 import WishlistButton from '@components/wishlist/WishlistButton'
 
-import usePrice from '@framework/use-price'
+import usePrice from '@framework/product/use-price'
 import type { ProductNode } from '@framework/api/operations/get-all-products'
 
 interface Props {

components/product/ProductView/ProductView.tsx

@@ -8,7 +8,7 @@ import { useUI } from '@components/ui/context'
 import { Swatch, ProductSlider } from '@components/product'
 import { Button, Container, Text } from '@components/ui'
 
-import usePrice from '@framework/use-price'
+import usePrice from '@framework/product/use-price'
 import useAddItem from '@framework/cart/use-add-item'
 import type { ProductNode } from '@framework/api/operations/get-product'
 import {

components/wishlist/WishlistButton/WishlistButton.tsx

@@ -4,7 +4,7 @@ import { Heart } from '@components/icons'
 import { useUI } from '@components/ui/context'
 
 import type { ProductNode } from '@framework/api/operations/get-all-products'
-import useCustomer from '@framework/use-customer'
+import useCustomer from '@framework/customer/use-customer'
 import useAddItem from '@framework/wishlist/use-add-item'
 import useWishlist from '@framework/wishlist/use-wishlist'
 import useRemoveItem from '@framework/wishlist/use-remove-item'

components/wishlist/WishlistCard/WishlistCard.tsx

@@ -3,7 +3,7 @@ import cn from 'classnames'
 import Link from 'next/link'
 import Image from 'next/image'
 import type { WishlistItem } from '@framework/api/wishlist'
-import usePrice from '@framework/use-price'
+import usePrice from '@framework/product/use-price'
 import useRemoveItem from '@framework/wishlist/use-remove-item'
 import useAddItem from '@framework/cart/use-add-item'
 import { useUI } from '@components/ui/context'

framework/bigcommerce/auth/index.ts

@@ -0,0 +1,3 @@
+export { default as useLogin } from './use-login'
+export { default as useLogout } from './use-logout'
+export { default as useSignup } from './use-signup'

framework/bigcommerce/auth/use-login.tsx

@@ -2,8 +2,8 @@ import { useCallback } from 'react'
 import type { HookFetcher } from '@commerce/utils/types'
 import { CommerceError } from '@commerce/utils/errors'
 import useCommerceLogin from '@commerce/use-login'
-import type { LoginBody } from './api/customers/login'
-import useCustomer from './use-customer'
+import type { LoginBody } from '../api/customers/login'
+import useCustomer from '../customer/use-customer'
 
 const defaultOpts = {
   url: '/api/bigcommerce/customers/login',

framework/bigcommerce/auth/use-logout.tsx

@@ -1,7 +1,7 @@
 import { useCallback } from 'react'
 import type { HookFetcher } from '@commerce/utils/types'
 import useCommerceLogout from '@commerce/use-logout'
-import useCustomer from './use-customer'
+import useCustomer from '../customer/use-customer'
 
 const defaultOpts = {
   url: '/api/bigcommerce/customers/logout',

framework/bigcommerce/auth/use-signup.tsx

@@ -2,8 +2,8 @@ import { useCallback } from 'react'
 import type { HookFetcher } from '@commerce/utils/types'
 import { CommerceError } from '@commerce/utils/errors'
 import useCommerceSignup from '@commerce/use-signup'
-import type { SignupBody } from './api/customers/signup'
-import useCustomer from './use-customer'
+import type { SignupBody } from '../api/customers/signup'
+import useCustomer from '../customer/use-customer'
 
 const defaultOpts = {
   url: '/api/bigcommerce/customers/signup',

framework/bigcommerce/cart/index.ts

@@ -0,0 +1,5 @@
+export { default as useCart } from './use-cart'
+export { default as useAddItem } from './use-add-item'
+export { default as useRemoveItem } from './use-remove-item'
+export { default as useWishlistActions } from './use-cart-actions'
+export { default as useUpdateItem } from './use-cart-actions'

framework/bigcommerce/customer/index.ts

@@ -0,0 +1 @@
+export { default as useCustomer } from './use-customer'

framework/bigcommerce/customer/use-customer.tsx

@@ -1,7 +1,7 @@
 import type { HookFetcher } from '@commerce/utils/types'
 import type { SwrOptions } from '@commerce/utils/use-data'
 import useCommerceCustomer from '@commerce/use-customer'
-import type { Customer, CustomerData } from './api/customers'
+import type { Customer, CustomerData } from '../api/customers'
 
 const defaultOpts = {
   url: '/api/bigcommerce/customers',

framework/bigcommerce/product/index.ts

@@ -0,0 +1,2 @@
+export { default as usePrice } from './use-price'
+export { default as useSearch } from './use-search'

framework/bigcommerce/wishlist/use-add-item.tsx

@@ -3,7 +3,7 @@ import { HookFetcher } from '@commerce/utils/types'
 import { CommerceError } from '@commerce/utils/errors'
 import useWishlistAddItem from '@commerce/wishlist/use-add-item'
 import type { ItemBody, AddItemBody } from '../api/wishlist'
-import useCustomer from '../use-customer'
+import useCustomer from '../customer/use-customer'
 import useWishlist, { UseWishlistOptions, Wishlist } from './use-wishlist'
 
 const defaultOpts = {

framework/bigcommerce/wishlist/use-remove-item.tsx

@@ -3,7 +3,7 @@ import { HookFetcher } from '@commerce/utils/types'
 import { CommerceError } from '@commerce/utils/errors'
 import useWishlistRemoveItem from '@commerce/wishlist/use-remove-item'
 import type { RemoveItemBody } from '../api/wishlist'
-import useCustomer from '../use-customer'
+import useCustomer from '../customer/use-customer'
 import useWishlist, { UseWishlistOptions, Wishlist } from './use-wishlist'
 
 const defaultOpts = {

framework/bigcommerce/wishlist/use-wishlist.tsx

@@ -2,7 +2,7 @@ import { HookFetcher } from '@commerce/utils/types'
 import { SwrOptions } from '@commerce/utils/use-data'
 import useCommerceWishlist from '@commerce/wishlist/use-wishlist'
 import type { Wishlist } from '../api/wishlist'
-import useCustomer from '../use-customer'
+import useCustomer from '../customer/use-customer'
 
 const defaultOpts = {
   url: '/api/bigcommerce/wishlist',

pages/cart.tsx

@@ -2,7 +2,7 @@ import type { GetStaticPropsContext } from 'next'
 import { getConfig } from '@framework/api'
 import getAllPages from '@framework/api/operations/get-all-pages'
 import useCart from '@framework/cart/use-cart'
-import usePrice from '@framework/use-price'
+import usePrice from '@framework/product/use-price'
 import { Layout } from '@components/common'
 import { Button } from '@components/ui'
 import { Bag, Cross, Check } from '@components/icons'

pages/profile.tsx

@@ -1,7 +1,7 @@
 import type { GetStaticPropsContext } from 'next'
 import { getConfig } from '@framework/api'
 import getAllPages from '@framework/api/operations/get-all-pages'
-import useCustomer from '@framework/use-customer'
+import useCustomer from '@framework/customer/use-customer'
 import { Layout } from '@components/common'
 import { Container, Text } from '@components/ui'
 

pages/search.tsx

@@ -6,7 +6,7 @@ import { useRouter } from 'next/router'
 import { getConfig } from '@framework/api'
 import getAllPages from '@framework/api/operations/get-all-pages'
 import getSiteInfo from '@framework/api/operations/get-site-info'
-import useSearch from '@framework/products/use-search'
+import useSearch from '@framework/product/use-search'
 import { Layout } from '@components/common'
 import { ProductCard } from '@components/product'
 import { Container, Grid, Skeleton } from '@components/ui'