From 27f28afb831e6b5acc28c4ff21d71c67b0421331 Mon Sep 17 00:00:00 2001
From: loaizamateo <mateo_loaiza@epam.com>
Date: Tue, 12 Jul 2022 17:19:13 -0500
Subject: [PATCH 1/2] - List of products called dynamically - Path products
 gateway added by environment variables

---
 .../pages/PageProductForm/PageProductForm.tsx          |  4 ++--
 .../pages/PageProducts/components/Products.tsx         | 10 ++++------
 .../PageProductImport/components/ProductsTable.tsx     |  6 +++---
 src/constants/apiPaths.ts                              |  9 ++++-----
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/components/pages/PageProductForm/PageProductForm.tsx b/src/components/pages/PageProductForm/PageProductForm.tsx
index ca985f093..56c4a96d4 100755
--- a/src/components/pages/PageProductForm/PageProductForm.tsx
+++ b/src/components/pages/PageProductForm/PageProductForm.tsx
@@ -109,7 +109,7 @@ export default function PageProductForm() {
   const onSubmit = (values: FormikValues) => {
     const formattedValues = ProductSchema.cast(values);
     const productToSave = id ? {...ProductSchema.cast(formattedValues), id} : formattedValues;
-    axios.put(`${API_PATHS.bff}/product`, productToSave)
+    axios.put(`${API_PATHS.product}/products`, productToSave)
       .then(() => history.push('/admin/products'));
   };
 
@@ -118,7 +118,7 @@ export default function PageProductForm() {
       setIsLoading(false);
       return;
     }
-    axios.get(`${API_PATHS.bff}/product/${id}`)
+    axios.get(`${API_PATHS.product}/products/${id}`)
       .then(res => {
         setProduct(res.data);
         setIsLoading(false);
diff --git a/src/components/pages/PageProducts/components/Products.tsx b/src/components/pages/PageProducts/components/Products.tsx
index 810e3a8c4..93a21c29d 100755
--- a/src/components/pages/PageProducts/components/Products.tsx
+++ b/src/components/pages/PageProducts/components/Products.tsx
@@ -9,9 +9,8 @@ import {makeStyles} from '@material-ui/core/styles';
 import {Product} from "models/Product";
 import {formatAsPrice} from "utils/utils";
 import AddProductToCart from "components/AddProductToCart/AddProductToCart";
-// import axios from 'axios';
-// import API_PATHS from "constants/apiPaths";
-import productList from "./productList.json";
+import axios from 'axios';
+import API_PATHS from "constants/apiPaths";
 
 const useStyles = makeStyles((theme) => ({
   card: {
@@ -36,9 +35,8 @@ export default function Products() {
   const [products, setProducts] = useState<Product[]>([]);
 
   useEffect(() => {
-    // axios.get(`${API_PATHS.bff}/product/available/`)
-    //   .then(res => setProducts(res.data));
-    setProducts(productList);
+    axios.get(`${API_PATHS.product}/products`)
+      .then(res => setProducts(res.data));
   }, [])
 
   return (
diff --git a/src/components/pages/admin/PageProductImport/components/ProductsTable.tsx b/src/components/pages/admin/PageProductImport/components/ProductsTable.tsx
index 8d6a7cb0d..4a321e051 100755
--- a/src/components/pages/admin/PageProductImport/components/ProductsTable.tsx
+++ b/src/components/pages/admin/PageProductImport/components/ProductsTable.tsx
@@ -16,14 +16,14 @@ export default function ProductsTable() {
   const [products, setProducts] = useState<any>([]);
 
   useEffect(() => {
-    axios.get(`${API_PATHS.bff}/product`)
+    axios.get(`${API_PATHS.product}/products`)
       .then(res => setProducts(res.data));
   }, []);
 
   const onDelete = (id: string) => {
-    axios.delete(`${API_PATHS.bff}/product/${id}`)
+    axios.delete(`${API_PATHS.product}/products/${id}`)
       .then(() => {
-        axios.get(`${API_PATHS.bff}/product`)
+        axios.get(`${API_PATHS.product}/products`)
           .then(res => setProducts(res.data));
         }
       );
diff --git a/src/constants/apiPaths.ts b/src/constants/apiPaths.ts
index d3d09c2d8..a6f6d14af 100755
--- a/src/constants/apiPaths.ts
+++ b/src/constants/apiPaths.ts
@@ -1,10 +1,9 @@
 
 const API_PATHS = {
-  product: 'https://.execute-api.eu-west-1.amazonaws.com/dev',
-  order: 'https://.execute-api.eu-west-1.amazonaws.com/dev',
-  import: 'https://.execute-api.eu-west-1.amazonaws.com/dev',
-  bff: 'https://.execute-api.eu-west-1.amazonaws.com/dev',
-  cart: 'https://.execute-api.eu-west-1.amazonaws.com/dev',
+  product: `https://${process.env.REACT_APP_URL_PRODUCTS_GATEWAY}.execute-api.us-east-1.amazonaws.com/dev`,
+  order: 'https://.execute-api.us-east-1.amazonaws.com/dev',
+  import: 'https://.execute-api.us-east-1.amazonaws.com/dev',
+  cart: 'https://.execute-api.us-east-1.amazonaws.com/dev',
 };
 
 export default API_PATHS;

From 082a7cd682f87ee927938ec30fc64fa2f007cd1a Mon Sep 17 00:00:00 2001
From: loaizamateo <mateo_loaiza@epam.com>
Date: Tue, 12 Jul 2022 17:20:04 -0500
Subject: [PATCH 2/2] - .env added in gitignore

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index e8c210db6..df8500c56 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-
+.env
 # dependencies
 node_modules
 /.pnp