Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

.env
# dependencies
node_modules
/.pnp
Expand Down
4 changes: 2 additions & 2 deletions src/components/pages/PageProductForm/PageProductForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
};

Expand All @@ -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);
Expand Down
10 changes: 4 additions & 6 deletions src/components/pages/PageProducts/components/Products.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand All @@ -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 (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
);
Expand Down
9 changes: 4 additions & 5 deletions src/constants/apiPaths.ts
Original file line number Diff line number Diff line change
@@ -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;