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 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` ## Ссылки 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/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 = ({ = (props) => { {product.name} 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', 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, + }, });