From 6c700f636cffe728ad6df474646ba99f1443f620 Mon Sep 17 00:00:00 2001
From: Semyon Katz <kavabunga@gmail.com>
Date: Fri, 26 Jan 2024 16:31:07 +0200
Subject: [PATCH 1/5] feat: :closed_lock_with_key: add .env functionality

---
 src/data/constants.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/data/constants.ts b/src/data/constants.ts
index 32ce642..3449db3 100644
--- a/src/data/constants.ts
+++ b/src/data/constants.ts
@@ -1,5 +1,5 @@
-export const BACKEND_URL = 'https://goodfood.acceleratorpracticum.ru/api';
-export const BASE_URL = 'https://goodfood.acceleratorpracticum.ru';
+export const BACKEND_URL = import.meta.env.VITE_API_URL;
+export const BASE_URL = import.meta.env.VITE_BASE_URL;
 
 export const URLS = {
 	SIGNUP: '/signup',

From 46b64f9b4bf3bb751ec5528cc22e7f038091063d Mon Sep 17 00:00:00 2001
From: Semyon Katz <kavabunga@gmail.com>
Date: Fri, 26 Jan 2024 16:37:31 +0200
Subject: [PATCH 2/5] docs: :memo: mention .env in README

---
 README.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/README.md b/README.md
index abed174..f81861a 100644
--- a/README.md
+++ b/README.md
@@ -60,6 +60,17 @@ npm ci
 npm run dev
 ```
 
+### Env
+
+Адреса приложения и API необходимо указать в файле **.env** в корне проекта.
+
+#### Пример .env файла
+
+```text
+VITE_BASE_URL=http://localhost:3000
+VITE_API_URL=http://localhost:3000/api
+```
+
 Подробная информация по работе с проектом в файле `CONTRIBUTE.MD`
 
 ## Ссылки

From 31ea17eb6bce161181164e4c090867e20af4eba5 Mon Sep 17 00:00:00 2001
From: Semyon Katz <kavabunga@gmail.com>
Date: Sat, 27 Jan 2024 01:56:57 +0200
Subject: [PATCH 3/5] fix: :bug: fix path for image in shopping-item

---
 src/components/product-card/index.tsx  | 2 +-
 src/components/shopping-item/index.tsx | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/product-card/index.tsx b/src/components/product-card/index.tsx
index b05e846..f9c1061 100644
--- a/src/components/product-card/index.tsx
+++ b/src/components/product-card/index.tsx
@@ -87,7 +87,7 @@ const ProductCard: React.FC<ProductCardProps> = ({
 				<img
 					className={styles.image}
 					src={
-						cardImage !== undefined && cardImage !== null
+						cardImage
 							? cardImage.startsWith('/')
 								? `${BASE_URL}${cardImage}`
 								: cardImage
diff --git a/src/components/shopping-item/index.tsx b/src/components/shopping-item/index.tsx
index 2bf0290..b36285d 100644
--- a/src/components/shopping-item/index.tsx
+++ b/src/components/shopping-item/index.tsx
@@ -3,6 +3,7 @@ import styles from './shopping-item.module.scss';
 import { Link } from 'react-router-dom';
 import { useCart } from '@hooks/use-cart-context.ts';
 import { translateMeasureUnit } from '@utils/utils';
+import { BASE_URL } from '@data/constants';
 
 type ShoppingItemProps = {
 	product: {
@@ -44,7 +45,7 @@ const ShoppingItem: React.FC<ShoppingItemProps> = (props) => {
 			<Link to={`/catalog/${product.category}/${product.id}`}>
 				<img
 					className={styles.item__image}
-					src={`https://goodfood.acceleratorpracticum.ru/media/${product.photo}`}
+					src={`${BASE_URL}/media/${product.photo}`}
 					alt={product.name}
 				/>
 			</Link>

From 4cbafb3654fbb08f748cd6ffd476dfb634e6834a Mon Sep 17 00:00:00 2001
From: Semyon Katz <kavabunga@gmail.com>
Date: Sat, 27 Jan 2024 15:24:42 +0200
Subject: [PATCH 4/5] fix: :bug: add env vars config for vite

---
 env.d.ts       | 1 +
 vite.config.ts | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/env.d.ts b/env.d.ts
index 3fafe64..9d41ba2 100644
--- a/env.d.ts
+++ b/env.d.ts
@@ -1,5 +1,6 @@
 interface ImportMetaEnv {
 	VITE_API_URL: string;
+	VITE_BASE_URL: string;
 	NODE_ENV: string;
 	VITE_JWT_SECRET: string;
 	VITE_PORT: string;
diff --git a/vite.config.ts b/vite.config.ts
index d130a73..373fc88 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -21,4 +21,8 @@ export default defineConfig({
 		},
 	},
 	plugins: [react(), svgr()],
+	define: {
+		VITE_BASE_URL: process.env.VITE_BASE_URL,
+		VITE_API_URL: process.env.VITE_API_URL,
+	},
 });

From 847171602312689dba5dc0d3462d3e2b8fe82dd0 Mon Sep 17 00:00:00 2001
From: Semyon Katz <kavabunga@gmail.com>
Date: Sat, 27 Jan 2024 23:46:30 +0200
Subject: [PATCH 5/5] fix: :bug: add env injection commands to dokerfile

---
 Dockerfile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 398ff5e..a30ceae 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,5 +3,9 @@ WORKDIR /app
 COPY package*.json .
 RUN npm install
 COPY . .
+ARG VITE_BASE_URL
+ENV VITE_BASE_URL=$VITE_BASE_URL
+ARG VITE_API_URL
+ENV VITE_API_URL=$VITE_API_URL
 RUN npm run build
 CMD cp -r build result_build