Bump to 13

components/BreadCrumbs.tsx

@@ -2,7 +2,7 @@ import {ICategoryFlatItem} from 'boundless-api-client/types/catalog/category';
 import clsx from 'clsx';
 import Link from 'next/link';
 import {TQuery} from '../@types/common';
-import {getCategoryUrl} from '../lib/services/urls';
+import {getCategoryUrl} from '../lib/urls';
 
 export default function BreadCrumbs({parents, activeParams}: IBreadCrumbsProps) {
 	const _parents = [...parents];

components/FilterForm.tsx

@@ -12,7 +12,7 @@ import TextCharacteristic from './filterForm/TextCharacteristic';
 import BrandSelect from './filterForm/BrandSelect';
 import Stock from './filterForm/Stock';
 import _isEqualWith from 'lodash/isEqualWith';
-import {filterKeys, filterProductsQuery} from '../lib/services/category';
+import {filterKeys, filterProductsQuery} from '../lib/category';
 
 /**
  * @param filterFields - might be passed manually, e.g. pass:

components/cart/CartRow.tsx

@@ -1,8 +1,8 @@
 import {ICartItem} from 'boundless-api-client';
 import Link from 'next/link';
 import {formatMoney} from '../../lib/formatter';
-import {getCartImg} from '../../lib/services/imgs';
-import {getProductUrl} from '../../lib/services/urls';
+import {getCartImg} from '../../lib/imgs';
+import {getProductUrl} from '../../lib/urls';
 
 export default function CartRow({item, rmItem, onQtyChange}: ICartRowProps) {
 	return (

components/category/CategoryHomeMenu.tsx

@@ -1,8 +1,8 @@
 import clsx from 'clsx';
 import Link from 'next/link';
 import {ICategoryPartial} from '../../@types/category';
-import {getCategoryImg} from '../../lib/services/imgs';
-import {getCategoryUrl} from '../../lib/services/urls';
+import {getCategoryImg} from '../../lib/imgs';
+import {getCategoryUrl} from '../../lib/urls';
 
 export default function CategoryHomeMenu({categoryTree}: {categoryTree: ICategoryPartial[]}) {
 	return (

components/category/Sidebar.tsx

@@ -1,7 +1,7 @@
 import clsx from 'clsx';
 import Link from 'next/link';
-import {getCategoryImg} from '../../lib/services/imgs';
-import {getCategoryUrl} from '../../lib/services/urls';
+import {getCategoryImg} from '../../lib/imgs';
+import {getCategoryUrl} from '../../lib/urls';
 import {FontAwesomeIcon} from '@fortawesome/react-fontawesome';
 import {faChevronLeft} from '@fortawesome/free-solid-svg-icons/faChevronLeft';
 import {ICategoryFlatItem, ICategoryItem} from 'boundless-api-client/types/catalog/category';

components/header/ChooseVariantModal.tsx

@@ -2,7 +2,7 @@ import clsx from 'clsx';
 import {useEffect, useState} from 'react';
 import Modal from 'react-bootstrap/Modal';
 import {useAppDispatch, useAppSelector} from '../../hooks/redux';
-import {getLowestPrice} from '../../lib/services/price';
+import {getLowestPrice} from '../../lib/price';
 import {addItem2Cart} from '../../redux/actions/cart';
 import {hideVariantModal} from '../../redux/reducers/cart';
 import {RootState} from '../../redux/store';

components/product/Images.tsx

@@ -2,7 +2,7 @@ import React, {useState} from 'react';
 import {IProductImage} from 'boundless-api-client/types/image';
 import clsx from 'clsx';
 import ProductImage from './ProductImage';
-import {getMetaImgUrl, productImgRatio} from '../../lib/services/imgs';
+import {getMetaImgUrl, productImgRatio} from '../../lib/imgs';
 import ImagesSlider from './ImagesSlider';
 import NoImage from '../NoImage';
 import {IProductItem} from 'boundless-api-client';

components/product/PriceAndBuy.tsx

@@ -1,7 +1,7 @@
 import {useState} from 'react';
 import {IProductItem, IProductVariant} from 'boundless-api-client';
 import clsx from 'clsx';
-import {getLowestPrice, getProductPrice} from '../../lib/services/price';
+import {getLowestPrice, getProductPrice} from '../../lib/price';
 import {useAppDispatch} from '../../hooks/redux';
 import {addItem2Cart} from '../../redux/actions/cart';
 import {getPriceForTpl} from '../../lib/product';

components/product/ProductImage.tsx

@@ -1,5 +1,5 @@
 import Image from 'next/image';
-import {getProductImg, IImagePartial} from '../../lib/services/imgs';
+import {getProductImg, IImagePartial} from '../../lib/imgs';
 
 export default function ProductImage({image, alt, maxSize = 800, preserveRatio = false}: IProductImageProps) {
 	const {src, blurSrc, width, height} = getProductImg(image, maxSize, preserveRatio);

components/product/ProductMeta.tsx

@@ -1,5 +1,5 @@
 import {ICategoryFlatItem, IProductItem} from 'boundless-api-client';
-import {getProductItemUrl} from '../../lib/services/urls';
+import {getProductItemUrl} from '../../lib/urls';
 
 export default function ProductMeta({product, parents}: IProductMetaProps) {
 	return (

components/productsList/ProductImage.tsx

@@ -1,5 +1,5 @@
 import Image from 'next/image';
-import {getProductsListImg, IImagePartial} from '../../lib/services/imgs';
+import {getProductsListImg, IImagePartial} from '../../lib/imgs';
 
 export default function ProductListImage({image, alt, maxSize = 200}: {image: IImagePartial, alt: string, maxSize?: number}) {
 	const {src, blurSrc, width, height} = getProductsListImg(image, maxSize);

components/productsList/ProductItem.tsx

@@ -2,7 +2,7 @@ import {IProduct} from 'boundless-api-client/types/catalog/product';
 import clsx from 'clsx';
 import {useAppDispatch} from '../../hooks/redux';
 import {addItem2Cart} from '../../redux/actions/cart';
-import {getProductUrl} from '../../lib/services/urls';
+import {getProductUrl} from '../../lib/urls';
 import ProductListImage from './ProductImage';
 import ProductPrice from './ProductPrice';
 import {TQuery} from '../../@types/common';
@@ -11,7 +11,7 @@ import ProductLabels from '../product/Labels';
 import {FontAwesomeIcon} from '@fortawesome/react-fontawesome';
 import {faCartPlus} from '@fortawesome/free-solid-svg-icons/faCartPlus';
 import NoImage from '../NoImage';
-import {productImgRatio} from '../../lib/services/imgs';
+import {productImgRatio} from '../../lib/imgs';
 import {TThumbRatio} from '../../@types/image';
 
 export default function ProductItem({product, query, categoryId}: IProductItemProps) {

lib/services/category.ts → lib/category.ts

@@ -1,5 +1,5 @@
 import {IGetProductsParams} from 'boundless-api-client/endpoints/catalog';
-import {TQuery} from '../../@types/common';
+import {TQuery} from '../@types/common';
 
 export const filterKeys = ['brand', 'price_min', 'price_max', 'props', 'in_stock'];
 

lib/services/imgs.ts → lib/imgs.ts

@@ -1,5 +1,5 @@
-import {TThumbRatio} from '../../@types/image';
-import {apiClient} from '../api';
+import {TThumbRatio} from '../@types/image';
+import {apiClient} from './api';
 
 //fixed aspect ratio for product images
 export const productImgRatio = process.env.BOUNDLESS_PRODUCTS_IMAGE_PROPORTION as TThumbRatio || null;

lib/services/price.ts → lib/price.ts

@@ -1,5 +1,5 @@
 import {IProductVariant} from 'boundless-api-client';
-import {calcBenefit} from '../calculator';
+import {calcBenefit} from './calculator';
 import currency from 'currency.js';
 
 export const getLowestPrice = (variants: IProductVariant[]): IPrice => {

lib/services/urls.ts → lib/urls.ts

@@ -1,7 +1,7 @@
 import {ICategory, ICategoryItem} from 'boundless-api-client';
 import {IProduct, IProductItem} from 'boundless-api-client/types/catalog/product';
 import {createGetStr} from 'boundless-api-client/utils';
-import {TQuery} from '../../@types/common';
+import {TQuery} from '../@types/common';
 
 const CATEGORY_PREFIX = '/category';
 const PRODUCTS_PREFIX = '/product';

pages/category/[slug].tsx

@@ -11,14 +11,14 @@ import Pagination from '../../components/Pagination';
 import {NextRouter, useRouter} from 'next/router';
 import BreadCrumbs from '../../components/BreadCrumbs';
 import CategorySidebar from '../../components/category/Sidebar';
-import {filterProductsQuery} from '../../lib/services/category';
+import {filterProductsQuery} from '../../lib/category';
 import {TQuery} from '../../@types/common';
 import FilterForm from '../../components/FilterForm';
 import {createGetStr} from 'boundless-api-client/utils';
 import qs from 'qs';
-import {getCategoryItemUrl} from '../../lib/services/urls';
+import {getCategoryItemUrl} from '../../lib/urls';
 import SortButtons from '../../components/SortButtons';
-import {getCategoryMetaData} from '../../lib/services/meta';
+import {getCategoryMetaData} from '../../lib/meta';
 
 export default function CategoryPage({errorCode, data}: InferGetServerSidePropsType<typeof getServerSideProps>) {
 	const router = useRouter();

pages/product/[slug].tsx

@@ -11,7 +11,7 @@ import ProductPriceAndBuy from '../../components/product/PriceAndBuy';
 import qs, {ParsedQs} from 'qs';
 import ProductMeta from '../../components/product/ProductMeta';
 import ProductCharacteristics from '../../components/product/ProductCharacteristics';
-import {getProductMetaData} from '../../lib/services/meta';
+import {getProductMetaData} from '../../lib/meta';
 import ProductLabels from '../../components/product/Labels';
 import ProductVariantAndBuy from '../../components/product/VariantAndBuy';