Intis/prezentacija-komponiranje
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Intis:frontend
Branches Tags
Intis:main Intis:frontend
..
compare: Intis:95b0c5f1ad883a9908bf8ea5701bedd7bc752585
Branches Tags
Intis:main Intis:frontend

5 Commits
frontend ... 95b0c5f1ad

Author SHA1 Message Date
Eden Kirin
95b0c5f1ad FE tweaks 2024-01-18 13:17:45 +01:00
Eden Kirin
4dc99b740b Merge branch 'networking' 2024-01-16 22:47:04 +01:00
Eden Kirin
248364a686 Update diagrams 2024-01-16 22:46:43 +01:00
Eden Kirin
cd57e11404 Isolate networks 2024-01-16 21:37:32 +01:00
Eden Kirin
99ea80c93c Remove debug print 2024-01-16 17:11:03 +01:00
5 changed files with 1712 additions and 261 deletions
Expand all files Collapse all files

19
docker-compose.yml
View File

@ -5,6 +5,8 @@ services:
build:
context: ./database
dockerfile: Dockerfile
networks:
- backend-net
ports:
- 55432:5432
environment:
@ -19,6 +21,8 @@ services:
build:
context: ./machines
dockerfile: Dockerfile
networks:
- backend-net
environment:
- APPPORT=3000
- DBHOST=db
@ -37,6 +41,8 @@ services:
deploy:
mode: replicated
replicas: 2
networks:
- backend-net
environment:
- APPPORT=3000
- DBHOST=db
@ -49,6 +55,9 @@ services:
condition: service_healthy
proxy:
image: envoyproxy/envoy:v1.28-latest
networks:
- frontend-net
- backend-net
ports:
- "10000:10000"
volumes:
@ -60,9 +69,19 @@ services:
build:
context: ./frontend
dockerfile: Dockerfile
networks:
- frontend-net
environment:
- REACT_APP_BACKEND_API_URL="http://localhost:10000"
ports:
- "8080:80"
depends_on:
- proxy
networks:
frontend-net:
name: frontend-net
internal: false
backend-net:
name: backend-net
internal: true

1
frontend/Dockerfile
View File

@ -17,4 +17,3 @@ RUN \
FROM nginx:1.25-alpine
COPY --from=node-builder /node-builder/build/. /usr/share/nginx/html
RUN ls -alF /usr/share/nginx/html

41
frontend/public/index.html
View File

@ -1,43 +1,18 @@
<!DOCTYPE html>
<html lang="en">
<head>
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
name="description"
content="Web site created using create-react-app"
/>
<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.
<meta name="description" content="Komponiranje frontend demo" />
<title>Komponiranje frontend demo</title>
</head>
Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
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>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.
</body>
You can add webfonts, meta tags, or analytics to this file.
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>
</html>

2
frontend/src/components/ProductCard.js
View File

@ -7,7 +7,7 @@ import { CardActionArea } from "@mui/material";
import { PRODUCT_IMAGE_DIR } from "../const";
function ProductCard({ product }) {
const productImg = `${PRODUCT_IMAGE_DIR}/${product.image}`;
const productImg = `${PRODUCT_IMAGE_DIR}${product.image}`;
return (
<Card>

1910
media/demo-overview.excalidraw
View File

File diff suppressed because it is too large Load Diff