diff --git a/src/components/making-order-btn/index.tsx b/src/components/making-order-btn/index.tsx index d3d06043..8c6c7922 100644 --- a/src/components/making-order-btn/index.tsx +++ b/src/components/making-order-btn/index.tsx @@ -1,7 +1,7 @@ import React from 'react'; import styles from './making-order-btn.module.scss'; -import Button from '@components/button'; -import type { ButtonProps } from '@components/button'; +import Button from '@components/Button'; +import type { ButtonProps } from '@components/Button'; interface MakingOrderBtnProps extends Pick {} diff --git a/src/components/payment-button/index.tsx b/src/components/payment-button/index.tsx index b7cc8b1d..aa1b6884 100644 --- a/src/components/payment-button/index.tsx +++ b/src/components/payment-button/index.tsx @@ -1,6 +1,6 @@ import { useState } from 'react'; import api from '@services/api'; -import Button from '@components/button'; +import Button from '@components/Button'; import styles from './payment-button.module.scss'; type PaymentButtonProps = { diff --git a/src/components/product-card/index.tsx b/src/components/product-card/index.tsx index 3791b25f..9eb268e3 100644 --- a/src/components/product-card/index.tsx +++ b/src/components/product-card/index.tsx @@ -1,6 +1,6 @@ import React, { useEffect, useState } from 'react'; import { Link } from 'react-router-dom'; -import Button from '@components/button'; +import Button from '@components/Button'; import styles from './product-card.module.scss'; import { BASE_URL } from '@data/constants.ts'; import LikeIcon from '@images/like-icon.svg?react'; diff --git a/src/components/shopping-list/index.tsx b/src/components/shopping-list/index.tsx index 0e061349..fdb56a7e 100644 --- a/src/components/shopping-list/index.tsx +++ b/src/components/shopping-list/index.tsx @@ -8,9 +8,10 @@ type ProductItem = { photo: string; category: string; quantity: number; - created_at: number; final_price: number; total_price: number; + amount: number; + measure_unit: string; }; type CartDataItem = { diff --git a/src/components/top-selling-this-week/index.tsx b/src/components/top-selling-this-week/index.tsx index c0479597..cafd943e 100644 --- a/src/components/top-selling-this-week/index.tsx +++ b/src/components/top-selling-this-week/index.tsx @@ -1,7 +1,7 @@ import React, { useEffect, useState } from 'react'; import api from '@services/api'; import type { Product } from '@services/generated-api/data-contracts'; -import Button from '@components/button'; +import Button from '@components/Button'; import ProductCard from '@components/product-card'; import styles from './top-selling-this-week.module.scss'; diff --git a/src/pages/product/index.tsx b/src/pages/product/index.tsx index 03e149ae..ad968d9a 100644 --- a/src/pages/product/index.tsx +++ b/src/pages/product/index.tsx @@ -1,6 +1,6 @@ import React, { useEffect } from 'react'; import styles from './product.module.scss'; -import Button from '@components/button'; +import Button from '@components/Button'; import { useParams } from 'react-router'; import api from '@services/api.ts'; import Preloader from '@components/preloader';