fix: padding in category

src/components/Button/button.module.scss

@@ -25,8 +25,8 @@
 	transition: 0.5s;
 
 	&:disabled {
-		background-color: black;
-		cursor: not-allowed;
+		background-color: $accent-color-lightest-green;
+		cursor: initial;
 	}
 }
 

src/components/Button/index.tsx

@@ -1,10 +1,14 @@
 import clsx from 'clsx';
 import styles from './button.module.scss';
 
-type ButtonProps = {
+export type ButtonProps = {
 	buttonText: string;
-	buttonStyle: string;
-	classNameActive?: string;
+	buttonStyle:
+		| 'green-border-button'
+		| 'green-border-button__active'
+		| 'greenish-button'
+		| 'green-button';
+	classNameActive?: 'greenish-button__active' | '';
 	onClick?: () => void;
 	disabled?: boolean;
 	classNames?: string;

src/components/making-order-btn/index.tsx

@@ -1,15 +1,19 @@
 import React from 'react';
 import styles from './making-order-btn.module.scss';
 import Button from '@components/Button';
+import type { ButtonProps } from '@components/Button';
 
-interface MakingOrderBtnProps {
-	onClick?: () => void;
-}
+interface MakingOrderBtnProps extends Pick<ButtonProps, 'disabled' | 'onClick'> {}
 
-const MakingOrderBtn: React.FC<MakingOrderBtnProps> = ({ onClick }) => {
+const MakingOrderBtn: React.FC<MakingOrderBtnProps> = ({ onClick, disabled }) => {
 	return (
 		<div className={styles.order}>
-			<Button buttonText="Оформить заказ" buttonStyle="green-button" onClick={onClick} />
+			<Button
+				buttonText="Оформить заказ"
+				buttonStyle="green-button"
+				onClick={onClick}
+				disabled={disabled}
+			/>
 			<p className={`${styles.order__title}`}>
 				Нажимая на&nbsp;кнопку &laquo;Оформить заказ&raquo;, вы&nbsp;соглашаетесь
 				с&nbsp;условиями обработки персональных данных, а&nbsp;также с&nbsp;условиями

src/components/making-order-btn/making-order-btn.module.scss

@@ -47,8 +47,8 @@
 	transition: 0.5s;
 
 	&:disabled {
-		background-color: black;
-		cursor: not-allowed;
+		background-color: $accent-color-lightest-green;
+		cursor: initial;
 	}
 }
 

src/components/recipes-components/products-list-popup/index.tsx

@@ -76,7 +76,7 @@ const ProductsListPopup: React.FC<RecipeIngredientsProps> = ({ ingredients }) =>
 								>
 									<img src={minusIcon} alt="минус" />
 								</button>
-								<p className={styles.counter__value}>{`${product.amount_of_pack} уп.`}</p>
+								<p className={styles.counter__value}>{product.amount_of_pack}</p>
 								<button
 									className={styles.counter__button}
 									onClick={() =>

src/components/shopping-item/index.tsx

@@ -50,9 +50,7 @@ const ShoppingItem: React.FC<ShoppingItemProps> = (props) => {
 						className={`${styles.item_btn} ${styles.item__decrease_btn}`}
 						onClick={handleDecreaseClick}
 					></button>
-					<p
-						className={`text_type_u ${styles.item__measure}`}
-					>{`${product.quantity} шт`}</p>
+					<p className={`text_type_u ${styles.item__measure}`}>{product.quantity}</p>
 					<button
 						className={`${styles.item_btn} ${styles.item__increase_btn}`}
 						onClick={handleIncreaseClick}

src/pages/category/category.module.scss

@@ -66,8 +66,10 @@
 .category__sorting {
 	width: 328px;
 	margin-right: 20px;
+	padding-top: 58px;
 
 	@media screen and (width <= 768px) {
+		padding-top: 0;
 		margin-right: 0;
 		max-width: 280px;
 	}

src/pages/checkout/checkout.module.scss

@@ -513,8 +513,8 @@
 	transition: 0.5s;
 
 	&:disabled {
-		background-color: black;
-		cursor: not-allowed;
+		background-color: $accent-color-lightest-green;
+		cursor: initial;
 	}
 }
 

src/pages/checkout/index.tsx

@@ -431,6 +431,7 @@ const Checkout: React.FC = () => {
 								!isLoggedIn && !isValid ? `${styles['orderse__buttonStyle_error']}` : ''
 							}`}
 							onClick={handleSubmitOrder}
+							disabled={cartData.products.length === 0}
 						>
 							Оформить заказ
 						</button>

src/pages/shopping-cart/index.tsx

@@ -118,7 +118,10 @@ const ShoppingCart: React.FC = () => {
 								</p>
 							</div>
 						</div>
-						<MakingOrderBtn onClick={handleSubmitOrderClick} />
+						<MakingOrderBtn
+							onClick={handleSubmitOrderClick}
+							disabled={cartData.products.length === 0}
+						/>
 					</div>
 				</div>
 			)}

src/services/api.ts

@@ -31,7 +31,7 @@ class Api {
 
 	_checkResponse(res: Response) {
 		if (res.ok) {
-			if (res.status === 204) return res;
+			if (res.status === 204 || res.status === 205) return res;
 			return res.json();
 		}