Compare commits
5 Commits
frontend
...
95b0c5f1ad
| Author | SHA1 | Date | |
|---|---|---|---|
| 95b0c5f1ad | |||
| 4dc99b740b | |||
| 248364a686 | |||
| cd57e11404 | |||
| 99ea80c93c |
@ -5,6 +5,8 @@ services:
|
|||||||
build:
|
build:
|
||||||
context: ./database
|
context: ./database
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
|
networks:
|
||||||
|
- backend-net
|
||||||
ports:
|
ports:
|
||||||
- 55432:5432
|
- 55432:5432
|
||||||
environment:
|
environment:
|
||||||
@ -19,6 +21,8 @@ services:
|
|||||||
build:
|
build:
|
||||||
context: ./machines
|
context: ./machines
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
|
networks:
|
||||||
|
- backend-net
|
||||||
environment:
|
environment:
|
||||||
- APPPORT=3000
|
- APPPORT=3000
|
||||||
- DBHOST=db
|
- DBHOST=db
|
||||||
@ -37,6 +41,8 @@ services:
|
|||||||
deploy:
|
deploy:
|
||||||
mode: replicated
|
mode: replicated
|
||||||
replicas: 2
|
replicas: 2
|
||||||
|
networks:
|
||||||
|
- backend-net
|
||||||
environment:
|
environment:
|
||||||
- APPPORT=3000
|
- APPPORT=3000
|
||||||
- DBHOST=db
|
- DBHOST=db
|
||||||
@ -49,6 +55,9 @@ services:
|
|||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
proxy:
|
proxy:
|
||||||
image: envoyproxy/envoy:v1.28-latest
|
image: envoyproxy/envoy:v1.28-latest
|
||||||
|
networks:
|
||||||
|
- frontend-net
|
||||||
|
- backend-net
|
||||||
ports:
|
ports:
|
||||||
- "10000:10000"
|
- "10000:10000"
|
||||||
volumes:
|
volumes:
|
||||||
@ -60,9 +69,19 @@ services:
|
|||||||
build:
|
build:
|
||||||
context: ./frontend
|
context: ./frontend
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
|
networks:
|
||||||
|
- frontend-net
|
||||||
environment:
|
environment:
|
||||||
- REACT_APP_BACKEND_API_URL="http://localhost:10000"
|
- REACT_APP_BACKEND_API_URL="http://localhost:10000"
|
||||||
ports:
|
ports:
|
||||||
- "8080:80"
|
- "8080:80"
|
||||||
depends_on:
|
depends_on:
|
||||||
- proxy
|
- proxy
|
||||||
|
|
||||||
|
networks:
|
||||||
|
frontend-net:
|
||||||
|
name: frontend-net
|
||||||
|
internal: false
|
||||||
|
backend-net:
|
||||||
|
name: backend-net
|
||||||
|
internal: true
|
||||||
|
|||||||
@ -17,4 +17,3 @@ RUN \
|
|||||||
FROM nginx:1.25-alpine
|
FROM nginx:1.25-alpine
|
||||||
|
|
||||||
COPY --from=node-builder /node-builder/build/. /usr/share/nginx/html
|
COPY --from=node-builder /node-builder/build/. /usr/share/nginx/html
|
||||||
RUN ls -alF /usr/share/nginx/html
|
|
||||||
|
|||||||
@ -1,43 +1,18 @@
|
|||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
<head>
|
|
||||||
|
<head>
|
||||||
<meta charset="utf-8" />
|
<meta charset="utf-8" />
|
||||||
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
|
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||||
<meta name="theme-color" content="#000000" />
|
<meta name="theme-color" content="#000000" />
|
||||||
<meta
|
<meta name="description" content="Komponiranje frontend demo" />
|
||||||
name="description"
|
<title>Komponiranje frontend demo</title>
|
||||||
content="Web site created using create-react-app"
|
</head>
|
||||||
/>
|
|
||||||
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
|
|
||||||
<!--
|
|
||||||
manifest.json provides metadata used when your web app is installed on a
|
|
||||||
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
|
|
||||||
-->
|
|
||||||
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
|
|
||||||
<!--
|
|
||||||
Notice the use of %PUBLIC_URL% in the tags above.
|
|
||||||
It will be replaced with the URL of the `public` folder during the build.
|
|
||||||
Only files inside the `public` folder can be referenced from the HTML.
|
|
||||||
|
|
||||||
Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
|
<body>
|
||||||
work correctly both with client-side routing and a non-root public URL.
|
|
||||||
Learn how to configure a non-root public URL by running `npm run build`.
|
|
||||||
-->
|
|
||||||
<title>React App</title>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<noscript>You need to enable JavaScript to run this app.</noscript>
|
<noscript>You need to enable JavaScript to run this app.</noscript>
|
||||||
<div id="root"></div>
|
<div id="root"></div>
|
||||||
<!--
|
</body>
|
||||||
This HTML file is a template.
|
|
||||||
If you open it directly in the browser, you will see an empty page.
|
|
||||||
|
|
||||||
You can add webfonts, meta tags, or analytics to this file.
|
</html>
|
||||||
The build step will place the bundled scripts into the <body> tag.
|
|
||||||
|
|
||||||
To begin the development, run `npm start` or `yarn start`.
|
|
||||||
To create a production bundle, use `npm run build` or `yarn build`.
|
|
||||||
-->
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@ -7,7 +7,7 @@ import { CardActionArea } from "@mui/material";
|
|||||||
import { PRODUCT_IMAGE_DIR } from "../const";
|
import { PRODUCT_IMAGE_DIR } from "../const";
|
||||||
|
|
||||||
function ProductCard({ product }) {
|
function ProductCard({ product }) {
|
||||||
const productImg = `${PRODUCT_IMAGE_DIR}/${product.image}`;
|
const productImg = `${PRODUCT_IMAGE_DIR}${product.image}`;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Card>
|
<Card>
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user