diff --git a/docker-compose.yml b/docker-compose.yml index 7afddd5..057549b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,7 +24,7 @@ services: networks: - backend-net environment: - - APPPORT=3000 + - APPPORT=4000 - DBHOST=db - DBPORT=5432 - DBNAME=komponiranje @@ -44,7 +44,7 @@ services: networks: - backend-net environment: - - APPPORT=3000 + - APPPORT=4001 - DBHOST=db - DBPORT=5432 - DBNAME=komponiranje diff --git a/frontend/public/index.html b/frontend/public/index.html index aa069f2..b724644 100644 --- a/frontend/public/index.html +++ b/frontend/public/index.html @@ -1,14 +1,12 @@ - + + - + - React App - - + Komponiranje frontend demo + + +
- - + + + \ No newline at end of file diff --git a/frontend/public/manifest.json b/frontend/public/manifest.json index 080d6c7..7815387 100644 --- a/frontend/public/manifest.json +++ b/frontend/public/manifest.json @@ -1,25 +1,25 @@ { - "short_name": "React App", - "name": "Create React App Sample", - "icons": [ - { - "src": "favicon.ico", - "sizes": "64x64 32x32 24x24 16x16", - "type": "image/x-icon" - }, - { - "src": "logo192.png", - "type": "image/png", - "sizes": "192x192" - }, - { - "src": "logo512.png", - "type": "image/png", - "sizes": "512x512" - } - ], - "start_url": ".", - "display": "standalone", - "theme_color": "#000000", - "background_color": "#ffffff" + "short_name": "Komponiranje", + "name": "Komponiranje frontend demo", + "icons": [ + { + "src": "favicon.ico", + "sizes": "64x64 32x32 24x24 16x16", + "type": "image/x-icon" + }, + { + "src": "logo192.png", + "type": "image/png", + "sizes": "192x192" + }, + { + "src": "logo512.png", + "type": "image/png", + "sizes": "512x512" + } + ], + "start_url": ".", + "display": "standalone", + "theme_color": "#000000", + "background_color": "#ffffff" } diff --git a/machines/Makefile b/machines/Makefile index 3765ea6..68fc109 100644 --- a/machines/Makefile +++ b/machines/Makefile @@ -26,8 +26,7 @@ docker-build: clean docker-run: @docker run \ --name $(CONTAINER_NAME) \ - --publish 3000:3000 \ - --env CONTAINER_NAME="Awesome API server" \ + --publish 4000:4000 \ --env DBPORT=55432 \ --detach \ $(IMAGE_NAME) diff --git a/machines/app/cfg/config.go b/machines/app/cfg/config.go index a64c239..22232a3 100644 --- a/machines/app/cfg/config.go +++ b/machines/app/cfg/config.go @@ -6,13 +6,13 @@ import ( type configStruct struct { AppHost string `default:"0.0.0.0"` - AppPort int `default:"3000"` + AppPort int `default:"4000"` DbHost string `default:"localhost"` DbPort int `default:"55432"` DbName string `default:"komponiranje"` DbUser string `default:"pero"` DbPassword string `default:"pero.000"` - ProductsAppUrl string `default:"http://localhost:3001"` + ProductsAppUrl string `default:"http://localhost:4001"` } const ENV_PREFIX = "" diff --git a/media/demo-overview.excalidraw b/media/demo-overview.excalidraw index dfb2c4f..d3bba1d 100644 --- a/media/demo-overview.excalidraw +++ b/media/demo-overview.excalidraw @@ -1105,8 +1105,8 @@ }, { "type": "text", - "version": 320, - "versionNonce": 365561188, + "version": 324, + "versionNonce": 2028613100, "isDeleted": false, "id": "RExyWP6iEbwZEwWGJ7ynn", "fillStyle": "cross-hatch", @@ -1128,7 +1128,7 @@ "frameId": null, "roundness": null, "boundElements": [], - "updated": 1705441161952, + "updated": 1706036591642, "link": null, "locked": false, "fontSize": 20, @@ -1303,8 +1303,8 @@ }, { "type": "text", - "version": 362, - "versionNonce": 1202724708, + "version": 366, + "versionNonce": 76084948, "isDeleted": false, "id": "FCRGzjxk1UBzWmGqDlFB5", "fillStyle": "cross-hatch", @@ -1326,7 +1326,7 @@ "frameId": null, "roundness": null, "boundElements": [], - "updated": 1705441154250, + "updated": 1706036591642, "link": null, "locked": false, "fontSize": 20, @@ -1411,7 +1411,7 @@ "containerId": "4H8oN-ypeQCBWDzOVtVQW", "originalText": "Products Container", "lineHeight": 1.25, - "baseline": 23 + "baseline": 26 }, { "type": "rectangle", @@ -1505,12 +1505,12 @@ "containerId": "sgmwBqZMfXCJB7d57hCMQ", "originalText": "products app 2", "lineHeight": 1.25, - "baseline": 23 + "baseline": 26 }, { "type": "text", - "version": 419, - "versionNonce": 1882419676, + "version": 423, + "versionNonce": 499486828, "isDeleted": false, "id": "u1OuuXnvKcO5rBbQ9og-m", "fillStyle": "cross-hatch", @@ -1532,7 +1532,7 @@ "frameId": null, "roundness": null, "boundElements": [], - "updated": 1705441154250, + "updated": 1706036591643, "link": null, "locked": false, "fontSize": 20, @@ -1547,8 +1547,8 @@ }, { "type": "text", - "version": 108, - "versionNonce": 1218507612, + "version": 112, + "versionNonce": 929758292, "isDeleted": false, "id": "puauPPmatsxiYK7nuxUmV", "fillStyle": "cross-hatch", @@ -1568,7 +1568,7 @@ "frameId": null, "roundness": null, "boundElements": [], - "updated": 1705441199515, + "updated": 1706036591643, "link": null, "locked": false, "fontSize": 20, @@ -1583,8 +1583,8 @@ }, { "type": "text", - "version": 214, - "versionNonce": 553347812, + "version": 218, + "versionNonce": 101753580, "isDeleted": false, "id": "ZR8aurk5K826Erslgmf7s", "fillStyle": "cross-hatch", @@ -1604,7 +1604,7 @@ "frameId": null, "roundness": null, "boundElements": [], - "updated": 1705441149449, + "updated": 1706036591643, "link": null, "locked": false, "fontSize": 20, @@ -1667,8 +1667,8 @@ }, { "type": "text", - "version": 49, - "versionNonce": 697640036, + "version": 53, + "versionNonce": 451957204, "isDeleted": false, "id": "nN4zD0iptScrivQUob483", "fillStyle": "cross-hatch", @@ -1688,7 +1688,7 @@ "frameId": null, "roundness": null, "boundElements": [], - "updated": 1705441191412, + "updated": 1706036591643, "link": null, "locked": false, "fontSize": 20, @@ -1703,8 +1703,8 @@ }, { "type": "text", - "version": 40, - "versionNonce": 1295725532, + "version": 44, + "versionNonce": 139814252, "isDeleted": false, "id": "EDr7aM0sLSQAwc4dMr2bn", "fillStyle": "cross-hatch", @@ -1724,7 +1724,7 @@ "frameId": null, "roundness": null, "boundElements": [], - "updated": 1705441170683, + "updated": 1706036591644, "link": null, "locked": false, "fontSize": 20, @@ -1739,8 +1739,8 @@ }, { "type": "text", - "version": 146, - "versionNonce": 1250391396, + "version": 152, + "versionNonce": 620979028, "isDeleted": false, "id": "mexveX3hsuycJnV_xFlwn", "fillStyle": "cross-hatch", @@ -1760,23 +1760,23 @@ "frameId": null, "roundness": null, "boundElements": [], - "updated": 1705441182149, + "updated": 1706036641928, "link": null, "locked": false, "fontSize": 20, "fontFamily": 3, - "text": "machines-app:3000", + "text": "machines-app:4000", "textAlign": "left", "verticalAlign": "top", "containerId": null, - "originalText": "machines-app:3000", + "originalText": "machines-app:4000", "lineHeight": 1.2, "baseline": 19 }, { "type": "text", - "version": 318, - "versionNonce": 2047133788, + "version": 327, + "versionNonce": 504143596, "isDeleted": false, "id": "nWQ6dNawezlmi4uYfgWBy", "fillStyle": "cross-hatch", @@ -1786,7 +1786,7 @@ "opacity": 100, "angle": 0, "x": 4316.116079608326, - "y": -10700.817169101681, + "y": -10701.54448621816, "strokeColor": "#1e1e1e", "backgroundColor": "#a5d8ff", "width": 222.65625, @@ -1796,23 +1796,23 @@ "frameId": null, "roundness": null, "boundElements": [], - "updated": 1705441158184, + "updated": 1706036661239, "link": null, "locked": false, "fontSize": 20, "fontFamily": 3, - "text": "products-app-1:3000", + "text": "products-app-1:4001", "textAlign": "left", "verticalAlign": "top", "containerId": null, - "originalText": "products-app-1:3000", + "originalText": "products-app-1:4001", "lineHeight": 1.2, "baseline": 19 }, { "type": "text", - "version": 337, - "versionNonce": 1952066020, + "version": 345, + "versionNonce": 1571720148, "isDeleted": false, "id": "GWChLBYhFI9kdropPUQeG", "fillStyle": "cross-hatch", @@ -1832,16 +1832,16 @@ "frameId": null, "roundness": null, "boundElements": [], - "updated": 1705441154250, + "updated": 1706036665127, "link": null, "locked": false, "fontSize": 20, "fontFamily": 3, - "text": "products-app-2:3000", + "text": "products-app-2:4001", "textAlign": "left", "verticalAlign": "top", "containerId": null, - "originalText": "products-app-2:3000", + "originalText": "products-app-2:4001", "lineHeight": 1.2, "baseline": 19 }, @@ -1899,8 +1899,8 @@ }, { "type": "text", - "version": 79, - "versionNonce": 677247068, + "version": 83, + "versionNonce": 1991506540, "isDeleted": false, "id": "MRa2-4EMmdkvVd8S4eA5x", "fillStyle": "cross-hatch", @@ -1920,7 +1920,7 @@ "frameId": null, "roundness": null, "boundElements": [], - "updated": 1705440260386, + "updated": 1706036591645, "link": null, "locked": false, "fontSize": 20, @@ -1935,8 +1935,8 @@ }, { "type": "text", - "version": 53, - "versionNonce": 249645924, + "version": 57, + "versionNonce": 2054173268, "isDeleted": false, "id": "9D7Gw2OyaxH8PvxvmUAw1", "fillStyle": "cross-hatch", @@ -1961,7 +1961,7 @@ "type": "arrow" } ], - "updated": 1705440260386, + "updated": 1706036591645, "link": null, "locked": false, "fontSize": 20, @@ -2027,105 +2027,110 @@ ] }, { - "id": "r_c7nHWR8rBuftXFM1gBg", "type": "text", - "x": 3029.532031419297, - "y": -11431.188956566499, - "width": 464.0625, - "height": 43.199999999999996, - "angle": 0, - "strokeColor": "#1e1e1e", - "backgroundColor": "#a5d8ff", - "fillStyle": "cross-hatch", - "strokeWidth": 2, - "strokeStyle": "dotted", - "roughness": 2, - "opacity": 100, - "groupIds": [], - "frameId": null, - "roundness": null, - "seed": 1823765092, "version": 100, "versionNonce": 1710628956, "isDeleted": false, - "boundElements": null, - "updated": 1705441184799, - "link": null, - "locked": false, - "text": "Container architecture", - "fontSize": 36, - "fontFamily": 3, - "textAlign": "left", - "verticalAlign": "top", - "baseline": 34, - "containerId": null, - "originalText": "Container architecture", - "lineHeight": 1.2 - }, - { - "id": "ZVpAJ96jxDbQt2t491a4d", - "type": "text", - "x": 6603.211082577714, - "y": -11386.63432897264, - "width": 210.9375, - "height": 43.199999999999996, - "angle": 0, - "strokeColor": "#1e1e1e", - "backgroundColor": "#a5d8ff", + "id": "r_c7nHWR8rBuftXFM1gBg", "fillStyle": "cross-hatch", "strokeWidth": 2, "strokeStyle": "dotted", "roughness": 2, "opacity": 100, + "angle": 0, + "x": 3029.532031419297, + "y": -11431.188956566499, + "strokeColor": "#1e1e1e", + "backgroundColor": "#a5d8ff", + "width": 464.0625, + "height": 43.199999999999996, + "seed": 1823765092, "groupIds": [], "frameId": null, "roundness": null, - "seed": 967337572, + "boundElements": [], + "updated": 1705441184799, + "link": null, + "locked": false, + "fontSize": 36, + "fontFamily": 3, + "text": "Container architecture", + "textAlign": "left", + "verticalAlign": "top", + "containerId": null, + "originalText": "Container architecture", + "lineHeight": 1.2, + "baseline": 34 + }, + { + "type": "text", "version": 118, "versionNonce": 460374244, "isDeleted": false, - "boundElements": null, + "id": "ZVpAJ96jxDbQt2t491a4d", + "fillStyle": "cross-hatch", + "strokeWidth": 2, + "strokeStyle": "dotted", + "roughness": 2, + "opacity": 100, + "angle": 0, + "x": 6603.211082577714, + "y": -11386.63432897264, + "strokeColor": "#1e1e1e", + "backgroundColor": "#a5d8ff", + "width": 210.9375, + "height": 43.199999999999996, + "seed": 967337572, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], "updated": 1705441420840, "link": null, "locked": false, - "text": "Networking", "fontSize": 36, "fontFamily": 3, + "text": "Networking", "textAlign": "left", "verticalAlign": "top", - "baseline": 34, "containerId": null, "originalText": "Networking", - "lineHeight": 1.2 + "lineHeight": 1.2, + "baseline": 34 }, { - "id": "gj9Q1sVRJBGQzoszNuczP", "type": "line", - "x": 6735.546682598612, - "y": -10487.071737264107, - "width": 1660.3640878767465, - "height": 0, - "angle": 0, - "strokeColor": "#2f9e44", - "backgroundColor": "#a5d8ff", - "fillStyle": "cross-hatch", - "strokeWidth": 4, - "strokeStyle": "solid", - "roughness": 2, - "opacity": 100, - "groupIds": [], - "frameId": null, - "roundness": { - "type": 2 - }, - "seed": 2022623204, "version": 511, "versionNonce": 832200164, "isDeleted": false, - "boundElements": null, + "id": "gj9Q1sVRJBGQzoszNuczP", + "fillStyle": "cross-hatch", + "strokeWidth": 4, + "strokeStyle": "solid", + "roughness": 2, + "opacity": 100, + "angle": 0, + "x": 6735.546682598612, + "y": -10487.071737264107, + "strokeColor": "#2f9e44", + "backgroundColor": "#a5d8ff", + "width": 1660.3640878767465, + "height": 0, + "seed": 2022623204, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], "updated": 1705441081536, "link": null, "locked": false, + "startBinding": null, + "endBinding": null, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": null, "points": [ [ 0, @@ -2135,41 +2140,41 @@ 1660.3640878767465, 0 ] - ], - "lastCommittedPoint": null, - "startBinding": null, - "endBinding": null, - "startArrowhead": null, - "endArrowhead": null + ] }, { - "id": "KchvvXpab95B0FYbzrqNF", "type": "line", - "x": 6745.546682598612, - "y": -10395.7257326578, - "width": 1660.3640878767465, - "height": 0, - "angle": 0, - "strokeColor": "#e03131", - "backgroundColor": "#a5d8ff", - "fillStyle": "cross-hatch", - "strokeWidth": 4, - "strokeStyle": "solid", - "roughness": 2, - "opacity": 100, - "groupIds": [], - "frameId": null, - "roundness": { - "type": 2 - }, - "seed": 1925033700, "version": 554, "versionNonce": 2051971548, "isDeleted": false, - "boundElements": null, + "id": "KchvvXpab95B0FYbzrqNF", + "fillStyle": "cross-hatch", + "strokeWidth": 4, + "strokeStyle": "solid", + "roughness": 2, + "opacity": 100, + "angle": 0, + "x": 6745.546682598612, + "y": -10395.7257326578, + "strokeColor": "#e03131", + "backgroundColor": "#a5d8ff", + "width": 1660.3640878767465, + "height": 0, + "seed": 1925033700, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], "updated": 1705441074037, "link": null, "locked": false, + "startBinding": null, + "endBinding": null, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": null, "points": [ [ 0, @@ -2179,41 +2184,41 @@ 1660.3640878767465, 0 ] - ], - "lastCommittedPoint": null, - "startBinding": null, - "endBinding": null, - "startArrowhead": null, - "endArrowhead": null + ] }, { - "id": "85VXDSSe-kRyP1rXzfvQd", "type": "line", - "x": 7091.237341611951, - "y": -10581.071531753176, - "width": 1308.7660277331643, - "height": 0, - "angle": 0, - "strokeColor": "#9c36b5", - "backgroundColor": "#a5d8ff", + "version": 795, + "versionNonce": 1818301796, + "isDeleted": false, + "id": "85VXDSSe-kRyP1rXzfvQd", "fillStyle": "cross-hatch", "strokeWidth": 4, "strokeStyle": "solid", "roughness": 2, "opacity": 100, + "angle": 0, + "x": 7091.237341611951, + "y": -10581.071531753176, + "strokeColor": "#9c36b5", + "backgroundColor": "#a5d8ff", + "width": 1308.7660277331643, + "height": 0, + "seed": 1703919324, "groupIds": [], "frameId": null, "roundness": { "type": 2 }, - "seed": 1703919324, - "version": 795, - "versionNonce": 1818301796, - "isDeleted": false, - "boundElements": null, + "boundElements": [], "updated": 1705441105755, "link": null, "locked": false, + "startBinding": null, + "endBinding": null, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": null, "points": [ [ 0, @@ -2223,41 +2228,41 @@ 1308.7660277331643, 0 ] - ], - "lastCommittedPoint": null, - "startBinding": null, - "endBinding": null, - "startArrowhead": null, - "endArrowhead": null + ] }, { - "id": "s3wp2TRECBQ2eUXa3zz8L", "type": "line", - "x": 7112.3354612364255, - "y": -10967.229466930909, - "width": 0, - "height": 383.18222031518235, - "angle": 0, - "strokeColor": "#9c36b5", - "backgroundColor": "#a5d8ff", + "version": 253, + "versionNonce": 1441817308, + "isDeleted": false, + "id": "s3wp2TRECBQ2eUXa3zz8L", "fillStyle": "cross-hatch", "strokeWidth": 4, "strokeStyle": "solid", "roughness": 0, "opacity": 100, + "angle": 0, + "x": 7112.3354612364255, + "y": -10967.229466930909, + "strokeColor": "#9c36b5", + "backgroundColor": "#a5d8ff", + "width": 0, + "height": 383.18222031518235, + "seed": 1123354980, "groupIds": [], "frameId": null, "roundness": { "type": 2 }, - "seed": 1123354980, - "version": 253, - "versionNonce": 1441817308, - "isDeleted": false, - "boundElements": null, + "boundElements": [], "updated": 1705441105755, "link": null, "locked": false, + "startBinding": null, + "endBinding": null, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": null, "points": [ [ 0, @@ -2267,41 +2272,41 @@ 0, 383.18222031518235 ] - ], - "lastCommittedPoint": null, - "startBinding": null, - "endBinding": null, - "startArrowhead": null, - "endArrowhead": null + ] }, { - "id": "B-pdRIIkwxFAQsAiOWpX1", "type": "line", - "x": 6838.2784631836, - "y": -10962.948112593833, - "width": 0, - "height": 470.9502292069137, - "angle": 0, - "strokeColor": "#2f9e44", - "backgroundColor": "#a5d8ff", + "version": 464, + "versionNonce": 304996956, + "isDeleted": false, + "id": "B-pdRIIkwxFAQsAiOWpX1", "fillStyle": "cross-hatch", "strokeWidth": 4, "strokeStyle": "solid", "roughness": 0, "opacity": 100, + "angle": 0, + "x": 6838.2784631836, + "y": -10962.948112593833, + "strokeColor": "#2f9e44", + "backgroundColor": "#a5d8ff", + "width": 0, + "height": 470.9502292069137, + "seed": 1356495068, "groupIds": [], "frameId": null, "roundness": { "type": 2 }, - "seed": 1356495068, - "version": 464, - "versionNonce": 304996956, - "isDeleted": false, - "boundElements": null, + "boundElements": [], "updated": 1705441081536, "link": null, "locked": false, + "startBinding": null, + "endBinding": null, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": null, "points": [ [ 0, @@ -2311,41 +2316,41 @@ 0, 470.9502292069137 ] - ], - "lastCommittedPoint": null, - "startBinding": null, - "endBinding": null, - "startArrowhead": null, - "endArrowhead": null + ] }, { - "id": "1El7R8dNnDXTi2SErVJmw", "type": "line", - "x": 7047.59092248943, - "y": -10966.515916948125, - "width": 0, - "height": 475.94513352677313, - "angle": 0, - "strokeColor": "#2f9e44", - "backgroundColor": "#a5d8ff", + "version": 454, + "versionNonce": 1507656036, + "isDeleted": false, + "id": "1El7R8dNnDXTi2SErVJmw", "fillStyle": "cross-hatch", "strokeWidth": 4, "strokeStyle": "solid", "roughness": 0, "opacity": 100, + "angle": 0, + "x": 7047.59092248943, + "y": -10966.515916948125, + "strokeColor": "#2f9e44", + "backgroundColor": "#a5d8ff", + "width": 0, + "height": 475.94513352677313, + "seed": 967795676, "groupIds": [], "frameId": null, "roundness": { "type": 2 }, - "seed": 967795676, - "version": 454, - "versionNonce": 1507656036, - "isDeleted": false, - "boundElements": null, + "boundElements": [], "updated": 1705441081536, "link": null, "locked": false, + "startBinding": null, + "endBinding": null, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": null, "points": [ [ 0, @@ -2355,85 +2360,41 @@ 0, 475.94513352677313 ] - ], - "lastCommittedPoint": null, - "startBinding": null, - "endBinding": null, - "startArrowhead": null, - "endArrowhead": null + ] }, { - "id": "sSPO6to-V0zFaYEZEOk2r", "type": "line", - "x": 6991.22973972345, - "y": -10967.932879993785, - "width": 0, - "height": 570.8385053264337, - "angle": 0, - "strokeColor": "#e03131", - "backgroundColor": "#a5d8ff", - "fillStyle": "cross-hatch", - "strokeWidth": 4, - "strokeStyle": "solid", - "roughness": 0, - "opacity": 100, - "groupIds": [], - "frameId": null, - "roundness": { - "type": 2 - }, - "seed": 1475481436, "version": 585, "versionNonce": 1274057700, "isDeleted": false, - "boundElements": null, - "updated": 1705441069570, - "link": null, - "locked": false, - "points": [ - [ - 0, - 0 - ], - [ - 0, - 570.8385053264337 - ] - ], - "lastCommittedPoint": null, - "startBinding": null, - "endBinding": null, - "startArrowhead": null, - "endArrowhead": null - }, - { - "id": "xOsQZGw6-nv6DQiBEtiky", - "type": "line", - "x": 6768.948457184312, - "y": -10968.413516277185, - "width": 0, - "height": 570.8385053264337, - "angle": 0, - "strokeColor": "#e03131", - "backgroundColor": "#a5d8ff", + "id": "sSPO6to-V0zFaYEZEOk2r", "fillStyle": "cross-hatch", "strokeWidth": 4, "strokeStyle": "solid", "roughness": 0, "opacity": 100, + "angle": 0, + "x": 6991.22973972345, + "y": -10967.932879993785, + "strokeColor": "#e03131", + "backgroundColor": "#a5d8ff", + "width": 0, + "height": 570.8385053264337, + "seed": 1475481436, "groupIds": [], "frameId": null, "roundness": { "type": 2 }, - "seed": 152029020, - "version": 674, - "versionNonce": 1708398436, - "isDeleted": false, - "boundElements": null, - "updated": 1705441286670, + "boundElements": [], + "updated": 1705441069570, "link": null, "locked": false, + "startBinding": null, + "endBinding": null, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": null, "points": [ [ 0, @@ -2443,37 +2404,76 @@ 0, 570.8385053264337 ] - ], - "lastCommittedPoint": null, - "startBinding": null, - "endBinding": null, - "startArrowhead": null, - "endArrowhead": null + ] }, { - "id": "7Kh9H0drGycCW4BkV0dpo", - "type": "rectangle", - "x": 6692.5687089555095, - "y": -11229.217309379159, - "width": 211.4195084561806, - "height": 258.508161024889, + "type": "line", + "version": 674, + "versionNonce": 1708398436, + "isDeleted": false, + "id": "xOsQZGw6-nv6DQiBEtiky", + "fillStyle": "cross-hatch", + "strokeWidth": 4, + "strokeStyle": "solid", + "roughness": 0, + "opacity": 100, "angle": 0, - "strokeColor": "#1971c2", + "x": 6768.948457184312, + "y": -10968.413516277185, + "strokeColor": "#e03131", "backgroundColor": "#a5d8ff", + "width": 0, + "height": 570.8385053264337, + "seed": 152029020, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1705441286670, + "link": null, + "locked": false, + "startBinding": null, + "endBinding": null, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": null, + "points": [ + [ + 0, + 0 + ], + [ + 0, + 570.8385053264337 + ] + ] + }, + { + "type": "rectangle", + "version": 145, + "versionNonce": 1548033756, + "isDeleted": false, + "id": "7Kh9H0drGycCW4BkV0dpo", "fillStyle": "cross-hatch", "strokeWidth": 2, "strokeStyle": "solid", "roughness": 2, "opacity": 100, + "angle": 0, + "x": 6692.5687089555095, + "y": -11229.217309379159, + "strokeColor": "#1971c2", + "backgroundColor": "#a5d8ff", + "width": 211.4195084561806, + "height": 258.508161024889, + "seed": 750388188, "groupIds": [], "frameId": null, "roundness": { "type": 3 }, - "seed": 750388188, - "version": 145, - "versionNonce": 1548033756, - "isDeleted": false, "boundElements": [ { "type": "text", @@ -2485,65 +2485,65 @@ "locked": false }, { - "id": "0SpHmipBS3K7LSJT47xFN", "type": "text", - "x": 6723.164434252935, - "y": -11144.963228866714, - "width": 150.22805786132812, - "height": 90, - "angle": 0, - "strokeColor": "#1971c2", - "backgroundColor": "#a5d8ff", - "fillStyle": "cross-hatch", - "strokeWidth": 2, - "strokeStyle": "solid", - "roughness": 2, - "opacity": 100, - "groupIds": [], - "frameId": null, - "roundness": null, - "seed": 502564060, "version": 170, "versionNonce": 2110419932, "isDeleted": false, - "boundElements": null, - "updated": 1705441473993, - "link": null, - "locked": false, - "text": "Frontend\n/ nginx", - "fontSize": 36, - "fontFamily": 1, - "textAlign": "center", - "verticalAlign": "middle", - "baseline": 76, - "containerId": "7Kh9H0drGycCW4BkV0dpo", - "originalText": "Frontend\n/ nginx", - "lineHeight": 1.25 - }, - { - "id": "KdfHGbZuBhHKzMqDVXpPX", - "type": "rectangle", - "x": 6942.52720199149, - "y": -11229.217309379159, - "width": 211.4195084561806, - "height": 258.508161024889, - "angle": 0, - "strokeColor": "#1971c2", - "backgroundColor": "#a5d8ff", + "id": "0SpHmipBS3K7LSJT47xFN", "fillStyle": "cross-hatch", "strokeWidth": 2, "strokeStyle": "solid", "roughness": 2, "opacity": 100, + "angle": 0, + "x": 6723.164434252935, + "y": -11144.963228866714, + "strokeColor": "#1971c2", + "backgroundColor": "#a5d8ff", + "width": 150.22805786132812, + "height": 90, + "seed": 502564060, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1705441473993, + "link": null, + "locked": false, + "fontSize": 36, + "fontFamily": 1, + "text": "Frontend\n/ nginx", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "7Kh9H0drGycCW4BkV0dpo", + "originalText": "Frontend\n/ nginx", + "lineHeight": 1.25, + "baseline": 79 + }, + { + "type": "rectangle", + "version": 215, + "versionNonce": 1819599708, + "isDeleted": false, + "id": "KdfHGbZuBhHKzMqDVXpPX", + "fillStyle": "cross-hatch", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 2, + "opacity": 100, + "angle": 0, + "x": 6942.52720199149, + "y": -11229.217309379159, + "strokeColor": "#1971c2", + "backgroundColor": "#a5d8ff", + "width": 211.4195084561806, + "height": 258.508161024889, + "seed": 375135588, "groupIds": [], "frameId": null, "roundness": { "type": 3 }, - "seed": 375135588, - "version": 215, - "versionNonce": 1819599708, - "isDeleted": false, "boundElements": [ { "type": "text", @@ -2555,65 +2555,65 @@ "locked": false }, { - "id": "9ghDrRtbL23NqtS0gJvEM", "type": "text", - "x": 7000.068941693213, - "y": -11122.463228866714, - "width": 96.33602905273438, - "height": 45, - "angle": 0, - "strokeColor": "#1971c2", - "backgroundColor": "#a5d8ff", - "fillStyle": "cross-hatch", - "strokeWidth": 2, - "strokeStyle": "solid", - "roughness": 2, - "opacity": 100, - "groupIds": [], - "frameId": null, - "roundness": null, - "seed": 587848412, "version": 221, "versionNonce": 1816301668, "isDeleted": false, - "boundElements": null, - "updated": 1705441119897, - "link": null, - "locked": false, - "text": "Proxy", - "fontSize": 36, - "fontFamily": 1, - "textAlign": "center", - "verticalAlign": "middle", - "baseline": 31, - "containerId": "KdfHGbZuBhHKzMqDVXpPX", - "originalText": "Proxy", - "lineHeight": 1.25 - }, - { - "id": "BiJveNc-a28JUWofV5Exi", - "type": "rectangle", - "x": 7192.485695027471, - "y": -11229.217309379159, - "width": 211.4195084561806, - "height": 258.508161024889, - "angle": 0, - "strokeColor": "#1971c2", - "backgroundColor": "#a5d8ff", + "id": "9ghDrRtbL23NqtS0gJvEM", "fillStyle": "cross-hatch", "strokeWidth": 2, "strokeStyle": "solid", "roughness": 2, "opacity": 100, + "angle": 0, + "x": 7000.068941693213, + "y": -11122.463228866714, + "strokeColor": "#1971c2", + "backgroundColor": "#a5d8ff", + "width": 96.33602905273438, + "height": 45, + "seed": 587848412, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1705441119897, + "link": null, + "locked": false, + "fontSize": 36, + "fontFamily": 1, + "text": "Proxy", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "KdfHGbZuBhHKzMqDVXpPX", + "originalText": "Proxy", + "lineHeight": 1.25, + "baseline": 34 + }, + { + "type": "rectangle", + "version": 264, + "versionNonce": 1530402780, + "isDeleted": false, + "id": "BiJveNc-a28JUWofV5Exi", + "fillStyle": "cross-hatch", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 2, + "opacity": 100, + "angle": 0, + "x": 7192.485695027471, + "y": -11229.217309379159, + "strokeColor": "#1971c2", + "backgroundColor": "#a5d8ff", + "width": 211.4195084561806, + "height": 258.508161024889, + "seed": 2029075556, "groupIds": [], "frameId": null, "roundness": { "type": 3 }, - "seed": 2029075556, - "version": 264, - "versionNonce": 1530402780, - "isDeleted": false, "boundElements": [ { "type": "text", @@ -2625,65 +2625,65 @@ "locked": false }, { - "id": "t5mb7pIFeZ_YfGWq24617", "type": "text", - "x": 7222.505423925971, - "y": -11144.963228866714, - "width": 151.3800506591797, - "height": 90, - "angle": 0, - "strokeColor": "#1971c2", - "backgroundColor": "#a5d8ff", - "fillStyle": "cross-hatch", - "strokeWidth": 2, - "strokeStyle": "solid", - "roughness": 2, - "opacity": 100, - "groupIds": [], - "frameId": null, - "roundness": null, - "seed": 924462044, "version": 282, "versionNonce": 635102180, "isDeleted": false, - "boundElements": null, - "updated": 1705441119897, - "link": null, - "locked": false, - "text": "Machines\napp", - "fontSize": 36, - "fontFamily": 1, - "textAlign": "center", - "verticalAlign": "middle", - "baseline": 76, - "containerId": "BiJveNc-a28JUWofV5Exi", - "originalText": "Machines\napp", - "lineHeight": 1.25 - }, - { - "id": "MkquHBUdX8GXhkl6wO46V", - "type": "rectangle", - "x": 7442.444188063451, - "y": -11229.217309379159, - "width": 211.4195084561806, - "height": 258.508161024889, - "angle": 0, - "strokeColor": "#1971c2", - "backgroundColor": "#a5d8ff", + "id": "t5mb7pIFeZ_YfGWq24617", "fillStyle": "cross-hatch", "strokeWidth": 2, "strokeStyle": "solid", "roughness": 2, "opacity": 100, + "angle": 0, + "x": 7222.505423925971, + "y": -11144.963228866714, + "strokeColor": "#1971c2", + "backgroundColor": "#a5d8ff", + "width": 151.3800506591797, + "height": 90, + "seed": 924462044, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1705441119897, + "link": null, + "locked": false, + "fontSize": 36, + "fontFamily": 1, + "text": "Machines\napp", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "BiJveNc-a28JUWofV5Exi", + "originalText": "Machines\napp", + "lineHeight": 1.25, + "baseline": 79 + }, + { + "type": "rectangle", + "version": 302, + "versionNonce": 1688255580, + "isDeleted": false, + "id": "MkquHBUdX8GXhkl6wO46V", + "fillStyle": "cross-hatch", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 2, + "opacity": 100, + "angle": 0, + "x": 7442.444188063451, + "y": -11229.217309379159, + "strokeColor": "#1971c2", + "backgroundColor": "#a5d8ff", + "width": 211.4195084561806, + "height": 258.508161024889, + "seed": 1085136100, "groupIds": [], "frameId": null, "roundness": { "type": 3 }, - "seed": 1085136100, - "version": 302, - "versionNonce": 1688255580, - "isDeleted": false, "boundElements": [ { "type": "text", @@ -2695,65 +2695,65 @@ "locked": false }, { - "id": "2IzOZJULaydksKEgDFRMj", "type": "text", - "x": 7469.097912018104, - "y": -11144.963228866714, - "width": 158.112060546875, - "height": 90, - "angle": 0, - "strokeColor": "#1971c2", - "backgroundColor": "#a5d8ff", - "fillStyle": "cross-hatch", - "strokeWidth": 2, - "strokeStyle": "solid", - "roughness": 2, - "opacity": 100, - "groupIds": [], - "frameId": null, - "roundness": null, - "seed": 1331024732, "version": 332, "versionNonce": 1075627876, "isDeleted": false, - "boundElements": null, - "updated": 1705441119897, - "link": null, - "locked": false, - "text": "Products\napp 1", - "fontSize": 36, - "fontFamily": 1, - "textAlign": "center", - "verticalAlign": "middle", - "baseline": 76, - "containerId": "MkquHBUdX8GXhkl6wO46V", - "originalText": "Products\napp 1", - "lineHeight": 1.25 - }, - { - "id": "q2uKvHqnDuua6Q75zhnum", - "type": "rectangle", - "x": 7692.402681099432, - "y": -11229.217309379159, - "width": 211.4195084561806, - "height": 258.508161024889, - "angle": 0, - "strokeColor": "#1971c2", - "backgroundColor": "#a5d8ff", + "id": "2IzOZJULaydksKEgDFRMj", "fillStyle": "cross-hatch", "strokeWidth": 2, "strokeStyle": "solid", "roughness": 2, "opacity": 100, + "angle": 0, + "x": 7469.097912018104, + "y": -11144.963228866714, + "strokeColor": "#1971c2", + "backgroundColor": "#a5d8ff", + "width": 158.112060546875, + "height": 90, + "seed": 1331024732, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1705441119897, + "link": null, + "locked": false, + "fontSize": 36, + "fontFamily": 1, + "text": "Products\napp 1", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "MkquHBUdX8GXhkl6wO46V", + "originalText": "Products\napp 1", + "lineHeight": 1.25, + "baseline": 79 + }, + { + "type": "rectangle", + "version": 316, + "versionNonce": 1921044700, + "isDeleted": false, + "id": "q2uKvHqnDuua6Q75zhnum", + "fillStyle": "cross-hatch", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 2, + "opacity": 100, + "angle": 0, + "x": 7692.402681099432, + "y": -11229.217309379159, + "strokeColor": "#1971c2", + "backgroundColor": "#a5d8ff", + "width": 211.4195084561806, + "height": 258.508161024889, + "seed": 824728668, "groupIds": [], "frameId": null, "roundness": { "type": 3 }, - "seed": 824728668, - "version": 316, - "versionNonce": 1921044700, - "isDeleted": false, "boundElements": [ { "type": "text", @@ -2765,65 +2765,65 @@ "locked": false }, { - "id": "3z9F38R_dkHV9JSg1hqeL", "type": "text", - "x": 7719.056405054084, - "y": -11144.963228866714, - "width": 158.112060546875, - "height": 90, - "angle": 0, - "strokeColor": "#1971c2", - "backgroundColor": "#a5d8ff", - "fillStyle": "cross-hatch", - "strokeWidth": 2, - "strokeStyle": "solid", - "roughness": 2, - "opacity": 100, - "groupIds": [], - "frameId": null, - "roundness": null, - "seed": 425666404, "version": 347, "versionNonce": 257309412, "isDeleted": false, - "boundElements": null, - "updated": 1705441119897, - "link": null, - "locked": false, - "text": "Products\napp 2", - "fontSize": 36, - "fontFamily": 1, - "textAlign": "center", - "verticalAlign": "middle", - "baseline": 76, - "containerId": "q2uKvHqnDuua6Q75zhnum", - "originalText": "Products\napp 2", - "lineHeight": 1.25 - }, - { - "id": "rsGuERvEqYoZWlibKQh87", - "type": "rectangle", - "x": 7941.679039630749, - "y": -11229.217309379159, - "width": 211.4195084561806, - "height": 258.508161024889, - "angle": 0, - "strokeColor": "#1971c2", - "backgroundColor": "#a5d8ff", + "id": "3z9F38R_dkHV9JSg1hqeL", "fillStyle": "cross-hatch", "strokeWidth": 2, "strokeStyle": "solid", "roughness": 2, "opacity": 100, + "angle": 0, + "x": 7719.056405054084, + "y": -11144.963228866714, + "strokeColor": "#1971c2", + "backgroundColor": "#a5d8ff", + "width": 158.112060546875, + "height": 90, + "seed": 425666404, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1705441119897, + "link": null, + "locked": false, + "fontSize": 36, + "fontFamily": 1, + "text": "Products\napp 2", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "q2uKvHqnDuua6Q75zhnum", + "originalText": "Products\napp 2", + "lineHeight": 1.25, + "baseline": 79 + }, + { + "type": "rectangle", + "version": 378, + "versionNonce": 1684690268, + "isDeleted": false, + "id": "rsGuERvEqYoZWlibKQh87", + "fillStyle": "cross-hatch", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 2, + "opacity": 100, + "angle": 0, + "x": 7941.679039630749, + "y": -11229.217309379159, + "strokeColor": "#1971c2", + "backgroundColor": "#a5d8ff", + "width": 211.4195084561806, + "height": 258.508161024889, + "seed": 239653340, "groupIds": [], "frameId": null, "roundness": { "type": 3 }, - "seed": 239653340, - "version": 378, - "versionNonce": 1684690268, - "isDeleted": false, "boundElements": [ { "type": "text", @@ -2835,69 +2835,74 @@ "locked": false }, { - "id": "s3x5rJeP_wSwipyNmFsQj", "type": "text", - "x": 7958.396758946729, - "y": -11122.463228866714, - "width": 177.98406982421875, - "height": 45, - "angle": 0, - "strokeColor": "#1971c2", - "backgroundColor": "#a5d8ff", + "version": 417, + "versionNonce": 773144164, + "isDeleted": false, + "id": "s3x5rJeP_wSwipyNmFsQj", "fillStyle": "cross-hatch", "strokeWidth": 2, "strokeStyle": "solid", "roughness": 2, "opacity": 100, + "angle": 0, + "x": 7958.396758946729, + "y": -11122.463228866714, + "strokeColor": "#1971c2", + "backgroundColor": "#a5d8ff", + "width": 177.98406982421875, + "height": 45, + "seed": 1959447012, "groupIds": [], "frameId": null, "roundness": null, - "seed": 1959447012, - "version": 417, - "versionNonce": 773144164, - "isDeleted": false, - "boundElements": null, + "boundElements": [], "updated": 1705441119897, "link": null, "locked": false, - "text": "Database", "fontSize": 36, "fontFamily": 1, + "text": "Database", "textAlign": "center", "verticalAlign": "middle", - "baseline": 31, "containerId": "rsGuERvEqYoZWlibKQh87", "originalText": "Database", - "lineHeight": 1.25 + "lineHeight": 1.25, + "baseline": 34 }, { - "id": "kYfNetUfiZbhn7peOqnBp", "type": "line", - "x": 7293.557142782072, - "y": -10965.216083419364, - "width": 0, - "height": 380.45528682085387, - "angle": 0, - "strokeColor": "#9c36b5", - "backgroundColor": "#a5d8ff", + "version": 220, + "versionNonce": 165726436, + "isDeleted": false, + "id": "kYfNetUfiZbhn7peOqnBp", "fillStyle": "cross-hatch", "strokeWidth": 4, "strokeStyle": "solid", "roughness": 0, "opacity": 100, + "angle": 0, + "x": 7293.557142782072, + "y": -10965.216083419364, + "strokeColor": "#9c36b5", + "backgroundColor": "#a5d8ff", + "width": 0, + "height": 380.45528682085387, + "seed": 2139347420, "groupIds": [], "frameId": null, "roundness": { "type": 2 }, - "seed": 2139347420, - "version": 220, - "versionNonce": 165726436, - "isDeleted": false, - "boundElements": null, + "boundElements": [], "updated": 1705441105755, "link": null, "locked": false, + "startBinding": null, + "endBinding": null, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": null, "points": [ [ 0, @@ -2907,41 +2912,41 @@ 0, 380.45528682085387 ] - ], - "lastCommittedPoint": null, - "startBinding": null, - "endBinding": null, - "startArrowhead": null, - "endArrowhead": null + ] }, { - "id": "9-eSG2UppmWdChzApkms7", "type": "line", - "x": 7545.289081451066, - "y": -10965.216083419364, - "width": 0, - "height": 109.3021014542901, - "angle": 0, - "strokeColor": "#1971c2", - "backgroundColor": "#a5d8ff", + "version": 365, + "versionNonce": 787891804, + "isDeleted": false, + "id": "9-eSG2UppmWdChzApkms7", "fillStyle": "cross-hatch", "strokeWidth": 4, "strokeStyle": "solid", "roughness": 0, "opacity": 100, + "angle": 0, + "x": 7545.289081451066, + "y": -10965.216083419364, + "strokeColor": "#1971c2", + "backgroundColor": "#a5d8ff", + "width": 0, + "height": 109.3021014542901, + "seed": 469163100, "groupIds": [], "frameId": null, "roundness": { "type": 2 }, - "seed": 469163100, - "version": 365, - "versionNonce": 787891804, - "isDeleted": false, - "boundElements": null, + "boundElements": [], "updated": 1705441320360, "link": null, "locked": false, + "startBinding": null, + "endBinding": null, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": null, "points": [ [ 0, @@ -2951,41 +2956,41 @@ 0, 109.3021014542901 ] - ], - "lastCommittedPoint": null, - "startBinding": null, - "endBinding": null, - "startArrowhead": null, - "endArrowhead": null + ] }, { - "id": "9XuJ8V0lGHetqA_LPxEPy", "type": "line", - "x": 7796.339093773622, - "y": -10965.216083419364, - "width": 0, - "height": 107.87500148872277, - "angle": 0, - "strokeColor": "#1971c2", - "backgroundColor": "#a5d8ff", + "version": 374, + "versionNonce": 389864804, + "isDeleted": false, + "id": "9XuJ8V0lGHetqA_LPxEPy", "fillStyle": "cross-hatch", "strokeWidth": 4, "strokeStyle": "solid", "roughness": 0, "opacity": 100, + "angle": 0, + "x": 7796.339093773622, + "y": -10965.216083419364, + "strokeColor": "#1971c2", + "backgroundColor": "#a5d8ff", + "width": 0, + "height": 107.87500148872277, + "seed": 1710240860, "groupIds": [], "frameId": null, "roundness": { "type": 2 }, - "seed": 1710240860, - "version": 374, - "versionNonce": 389864804, - "isDeleted": false, - "boundElements": null, + "boundElements": [], "updated": 1705441320360, "link": null, "locked": false, + "startBinding": null, + "endBinding": null, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": null, "points": [ [ 0, @@ -2995,41 +3000,41 @@ 0, 107.87500148872277 ] - ], - "lastCommittedPoint": null, - "startBinding": null, - "endBinding": null, - "startArrowhead": null, - "endArrowhead": null + ] }, { - "id": "3GWhaNvA6Hdc5wOSnmcHC", "type": "line", - "x": 7664.463859448984, - "y": -10732.467929530423, - "width": 0, - "height": 150.5615506245431, - "angle": 0, - "strokeColor": "#9c36b5", - "backgroundColor": "#a5d8ff", + "version": 520, + "versionNonce": 404203356, + "isDeleted": false, + "id": "3GWhaNvA6Hdc5wOSnmcHC", "fillStyle": "cross-hatch", "strokeWidth": 4, "strokeStyle": "solid", "roughness": 0, "opacity": 100, + "angle": 0, + "x": 7664.463859448984, + "y": -10732.467929530423, + "strokeColor": "#9c36b5", + "backgroundColor": "#a5d8ff", + "width": 0, + "height": 150.5615506245431, + "seed": 1751004004, "groupIds": [], "frameId": null, "roundness": { "type": 2 }, - "seed": 1751004004, - "version": 520, - "versionNonce": 404203356, - "isDeleted": false, - "boundElements": null, + "boundElements": [], "updated": 1705441105755, "link": null, "locked": false, + "startBinding": null, + "endBinding": null, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": null, "points": [ [ 0, @@ -3039,41 +3044,41 @@ 0, 150.5615506245431 ] - ], - "lastCommittedPoint": null, - "startBinding": null, - "endBinding": null, - "startArrowhead": null, - "endArrowhead": null + ] }, { - "id": "FFJPCFqtq-oKA80rRiF0f", "type": "line", - "x": 8048.752854709942, - "y": -10965.216083419364, - "width": 0, - "height": 381.8823867864212, - "angle": 0, - "strokeColor": "#9c36b5", - "backgroundColor": "#a5d8ff", + "version": 337, + "versionNonce": 1411255396, + "isDeleted": false, + "id": "FFJPCFqtq-oKA80rRiF0f", "fillStyle": "cross-hatch", "strokeWidth": 4, "strokeStyle": "solid", "roughness": 0, "opacity": 100, + "angle": 0, + "x": 8048.752854709942, + "y": -10965.216083419364, + "strokeColor": "#9c36b5", + "backgroundColor": "#a5d8ff", + "width": 0, + "height": 381.8823867864212, + "seed": 1286033884, "groupIds": [], "frameId": null, "roundness": { "type": 2 }, - "seed": 1286033884, - "version": 337, - "versionNonce": 1411255396, - "isDeleted": false, - "boundElements": null, + "boundElements": [], "updated": 1705441105755, "link": null, "locked": false, + "startBinding": null, + "endBinding": null, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": null, "points": [ [ 0, @@ -3083,109 +3088,104 @@ 0, 381.8823867864212 ] - ], - "lastCommittedPoint": null, - "startBinding": null, - "endBinding": null, - "startArrowhead": null, - "endArrowhead": null + ] }, { - "id": "730LbSCguZiMfk6hgnXMb", "type": "text", - "x": 8145.880221636061, - "y": -10542.462473392661, - "width": 196.875, - "height": 33.6, - "angle": 0, - "strokeColor": "#2f9e44", - "backgroundColor": "#a5d8ff", - "fillStyle": "cross-hatch", - "strokeWidth": 4, - "strokeStyle": "solid", - "roughness": 0, - "opacity": 100, - "groupIds": [], - "frameId": null, - "roundness": null, - "seed": 1484973404, "version": 297, "versionNonce": 58377948, "isDeleted": false, - "boundElements": null, - "updated": 1705441110352, - "link": null, - "locked": false, - "text": "frontend-net", - "fontSize": 28, - "fontFamily": 3, - "textAlign": "left", - "verticalAlign": "top", - "baseline": 26, - "containerId": null, - "originalText": "frontend-net", - "lineHeight": 1.2 - }, - { - "id": "plaDlYXRWzCcelw8JS2NR", - "type": "text", - "x": 8145.880221636061, - "y": -10637.826587276302, - "width": 180.46875, - "height": 33.6, - "angle": 0, - "strokeColor": "#9c36b5", - "backgroundColor": "#a5d8ff", + "id": "730LbSCguZiMfk6hgnXMb", "fillStyle": "cross-hatch", "strokeWidth": 4, "strokeStyle": "solid", "roughness": 0, "opacity": 100, + "angle": 0, + "x": 8145.880221636061, + "y": -10542.462473392661, + "strokeColor": "#2f9e44", + "backgroundColor": "#a5d8ff", + "width": 196.875, + "height": 33.6, + "seed": 1484973404, "groupIds": [], "frameId": null, "roundness": null, - "seed": 1473110748, + "boundElements": [], + "updated": 1705441110352, + "link": null, + "locked": false, + "fontSize": 28, + "fontFamily": 3, + "text": "frontend-net", + "textAlign": "left", + "verticalAlign": "top", + "containerId": null, + "originalText": "frontend-net", + "lineHeight": 1.2, + "baseline": 26 + }, + { + "type": "text", "version": 383, "versionNonce": 232938460, "isDeleted": false, - "boundElements": null, + "id": "plaDlYXRWzCcelw8JS2NR", + "fillStyle": "cross-hatch", + "strokeWidth": 4, + "strokeStyle": "solid", + "roughness": 0, + "opacity": 100, + "angle": 0, + "x": 8145.880221636061, + "y": -10637.826587276302, + "strokeColor": "#9c36b5", + "backgroundColor": "#a5d8ff", + "width": 180.46875, + "height": 33.6, + "seed": 1473110748, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], "updated": 1705441105755, "link": null, "locked": false, - "text": "backend-net", "fontSize": 28, "fontFamily": 3, + "text": "backend-net", "textAlign": "left", "verticalAlign": "top", - "baseline": 26, "containerId": null, "originalText": "backend-net", - "lineHeight": 1.2 + "lineHeight": 1.2, + "baseline": 26 }, { - "id": "2ogTwHyVd9PQ7GHLkTBof", "type": "rectangle", - "x": 7460.952620064934, - "y": -10856.257815328992, - "width": 406.5272898717867, - "height": 121.41250017362836, - "angle": 0, - "strokeColor": "#f08c00", - "backgroundColor": "#a5d8ff", + "version": 110, + "versionNonce": 837228132, + "isDeleted": false, + "id": "2ogTwHyVd9PQ7GHLkTBof", "fillStyle": "cross-hatch", "strokeWidth": 2, "strokeStyle": "solid", "roughness": 0, "opacity": 100, + "angle": 0, + "x": 7460.952620064934, + "y": -10856.257815328992, + "strokeColor": "#f08c00", + "backgroundColor": "#a5d8ff", + "width": 406.5272898717867, + "height": 121.41250017362836, + "seed": 1289667932, "groupIds": [], "frameId": null, "roundness": { "type": 3 }, - "seed": 1289667932, - "version": 110, - "versionNonce": 837228132, - "isDeleted": false, "boundElements": [ { "type": "text", @@ -3197,292 +3197,292 @@ "locked": false }, { - "id": "4_umjt84YhrUDZLKlYYa6", "type": "text", - "x": 7545.344225205906, - "y": -10840.551565242178, - "width": 237.74407958984375, - "height": 90, - "angle": 0, - "strokeColor": "#f08c00", - "backgroundColor": "#a5d8ff", - "fillStyle": "cross-hatch", - "strokeWidth": 2, - "strokeStyle": "solid", - "roughness": 0, - "opacity": 100, - "groupIds": [], - "frameId": null, - "roundness": null, - "seed": 1253760988, "version": 91, "versionNonce": 344388060, "isDeleted": false, - "boundElements": null, + "id": "4_umjt84YhrUDZLKlYYa6", + "fillStyle": "cross-hatch", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 0, + "opacity": 100, + "angle": 0, + "x": 7545.344225205906, + "y": -10840.551565242178, + "strokeColor": "#f08c00", + "backgroundColor": "#a5d8ff", + "width": 237.74407958984375, + "height": 90, + "seed": 1253760988, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], "updated": 1705441115252, "link": null, "locked": false, - "text": "Docker\nload balancer", "fontSize": 36, "fontFamily": 1, + "text": "Docker\nload balancer", "textAlign": "center", "verticalAlign": "middle", - "baseline": 76, "containerId": "2ogTwHyVd9PQ7GHLkTBof", "originalText": "Docker\nload balancer", - "lineHeight": 1.25 + "lineHeight": 1.25, + "baseline": 79 }, { - "id": "TQvSfcnA3nV_jQz4WK0yV", "type": "text", + "version": 194, + "versionNonce": 1403565420, + "isDeleted": false, + "id": "TQvSfcnA3nV_jQz4WK0yV", + "fillStyle": "cross-hatch", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 0, + "opacity": 100, + "angle": 0, "x": 7308.873461664136, "y": -10944.092218889733, - "width": 131.25, - "height": 67.2, - "angle": 0, "strokeColor": "#9c36b5", "backgroundColor": "#a5d8ff", + "width": 131.25, + "height": 67.2, + "seed": 729029980, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1706036673699, + "link": null, + "locked": false, + "fontSize": 28, + "fontFamily": 3, + "text": "machines\n:4000", + "textAlign": "left", + "verticalAlign": "top", + "containerId": null, + "originalText": "machines\n:4000", + "lineHeight": 1.2, + "baseline": 60 + }, + { + "type": "text", + "version": 305, + "versionNonce": 548713580, + "isDeleted": false, + "id": "GhWBD8m4qB9vNzbezVu43", "fillStyle": "cross-hatch", "strokeWidth": 2, "strokeStyle": "solid", "roughness": 0, "opacity": 100, - "groupIds": [], - "frameId": null, - "roundness": null, - "seed": 729029980, - "version": 188, - "versionNonce": 270957412, - "isDeleted": false, - "boundElements": null, - "updated": 1705441378547, - "link": null, - "locked": false, - "text": "machines\n:3000", - "fontSize": 28, - "fontFamily": 3, - "textAlign": "left", - "verticalAlign": "top", - "baseline": 60, - "containerId": null, - "originalText": "machines\n:3000", - "lineHeight": 1.2 - }, - { - "id": "GhWBD8m4qB9vNzbezVu43", - "type": "text", + "angle": 0, "x": 7677.337678003597, "y": -10705.090811521612, + "strokeColor": "#9c36b5", + "backgroundColor": "#a5d8ff", "width": 131.25, "height": 67.2, - "angle": 0, - "strokeColor": "#9c36b5", - "backgroundColor": "#a5d8ff", + "seed": 206822628, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1706036677866, + "link": null, + "locked": false, + "fontSize": 28, + "fontFamily": 3, + "text": "products\n:4001", + "textAlign": "left", + "verticalAlign": "top", + "containerId": null, + "originalText": "products\n:4001", + "lineHeight": 1.2, + "baseline": 60 + }, + { + "type": "text", + "version": 392, + "versionNonce": 1412517740, + "isDeleted": false, + "id": "QLb8RhDef96RQoEssu6gv", "fillStyle": "cross-hatch", "strokeWidth": 2, "strokeStyle": "solid", "roughness": 0, "opacity": 100, - "groupIds": [], - "frameId": null, - "roundness": null, - "seed": 206822628, - "version": 297, - "versionNonce": 321509220, - "isDeleted": false, - "boundElements": null, - "updated": 1705441384022, - "link": null, - "locked": false, - "text": "products\n:3000", - "fontSize": 28, - "fontFamily": 3, - "textAlign": "left", - "verticalAlign": "top", - "baseline": 60, - "containerId": null, - "originalText": "products\n:3000", - "lineHeight": 1.2 - }, - { - "id": "QLb8RhDef96RQoEssu6gv", - "type": "text", + "angle": 0, "x": 8065.894304717478, "y": -10947.883170625757, + "strokeColor": "#9c36b5", + "backgroundColor": "#a5d8ff", "width": 82.03125, "height": 67.2, - "angle": 0, - "strokeColor": "#9c36b5", - "backgroundColor": "#a5d8ff", - "fillStyle": "cross-hatch", - "strokeWidth": 2, - "strokeStyle": "solid", - "roughness": 0, - "opacity": 100, + "seed": 2002053596, "groupIds": [], "frameId": null, "roundness": null, - "seed": 2002053596, - "version": 388, - "versionNonce": 922738908, - "isDeleted": false, - "boundElements": null, - "updated": 1705441403224, + "boundElements": [], + "updated": 1706036591646, "link": null, "locked": false, - "text": "db\n:5432", "fontSize": 28, "fontFamily": 3, + "text": "db\n:5432", "textAlign": "left", "verticalAlign": "top", - "baseline": 60, "containerId": null, "originalText": "db\n:5432", - "lineHeight": 1.2 + "lineHeight": 1.2, + "baseline": 60 }, { - "id": "AG0YCVYw9SFmKCPVJzRU2", "type": "text", + "version": 267, + "versionNonce": 1038003540, + "isDeleted": false, + "id": "AG0YCVYw9SFmKCPVJzRU2", + "fillStyle": "cross-hatch", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 0, + "opacity": 100, + "angle": 0, "x": 7126.6168861146925, "y": -10940.005768872516, - "width": 98.4375, - "height": 67.2, - "angle": 0, "strokeColor": "#9c36b5", "backgroundColor": "#a5d8ff", - "fillStyle": "cross-hatch", - "strokeWidth": 2, - "strokeStyle": "solid", - "roughness": 0, - "opacity": 100, + "width": 98.4375, + "height": 67.2, + "seed": 388964580, "groupIds": [], "frameId": null, "roundness": null, - "seed": 388964580, - "version": 263, - "versionNonce": 1716491484, - "isDeleted": false, - "boundElements": null, - "updated": 1705441362035, + "boundElements": [], + "updated": 1706036591646, "link": null, "locked": false, - "text": "proxy\n:10000", "fontSize": 28, "fontFamily": 3, + "text": "proxy\n:10000", "textAlign": "left", "verticalAlign": "top", - "baseline": 60, "containerId": null, "originalText": "proxy\n:10000", - "lineHeight": 1.2 + "lineHeight": 1.2, + "baseline": 60 }, { - "id": "whqwF4_ZRiAywlHdKXhU0", "type": "text", - "x": 8145.880221636061, - "y": -10444.384448896912, - "width": 196.875, - "height": 33.6, - "angle": 0, - "strokeColor": "#e03131", - "backgroundColor": "#a5d8ff", - "fillStyle": "cross-hatch", - "strokeWidth": 2, - "strokeStyle": "solid", - "roughness": 0, - "opacity": 100, - "groupIds": [], - "frameId": null, - "roundness": null, - "seed": 782532580, "version": 41, "versionNonce": 1307757788, "isDeleted": false, - "boundElements": null, + "id": "whqwF4_ZRiAywlHdKXhU0", + "fillStyle": "cross-hatch", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 0, + "opacity": 100, + "angle": 0, + "x": 8145.880221636061, + "y": -10444.384448896912, + "strokeColor": "#e03131", + "backgroundColor": "#a5d8ff", + "width": 196.875, + "height": 33.6, + "seed": 782532580, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], "updated": 1705441330343, "link": null, "locked": false, - "text": "host network", "fontSize": 28, "fontFamily": 3, + "text": "host network", "textAlign": "left", "verticalAlign": "top", - "baseline": 26, "containerId": null, "originalText": "host network", - "lineHeight": 1.2 + "lineHeight": 1.2, + "baseline": 26 }, { - "id": "Srw7ueHf48m5xHOQFuThQ", "type": "text", - "x": 6876.8351663453695, - "y": -10931.619280941908, - "width": 98.4375, - "height": 33.6, - "angle": 0, - "strokeColor": "#e03131", - "backgroundColor": "#a5d8ff", - "fillStyle": "cross-hatch", - "strokeWidth": 2, - "strokeStyle": "solid", - "roughness": 0, - "opacity": 100, - "groupIds": [], - "frameId": null, - "roundness": null, - "seed": 260990948, "version": 52, "versionNonce": 467214692, "isDeleted": false, - "boundElements": null, - "updated": 1705441245931, - "link": null, - "locked": false, - "text": ":10000", - "fontSize": 28, - "fontFamily": 3, - "textAlign": "left", - "verticalAlign": "top", - "baseline": 26, - "containerId": null, - "originalText": ":10000", - "lineHeight": 1.2 - }, - { - "id": "nXPshb-tThGBj3OkGgWS9", - "type": "text", - "x": 6667.7574528677405, - "y": -10931.619280941908, - "width": 82.03125, - "height": 33.6, - "angle": 0, - "strokeColor": "#e03131", - "backgroundColor": "#a5d8ff", + "id": "Srw7ueHf48m5xHOQFuThQ", "fillStyle": "cross-hatch", "strokeWidth": 2, "strokeStyle": "solid", "roughness": 0, "opacity": 100, + "angle": 0, + "x": 6876.8351663453695, + "y": -10931.619280941908, + "strokeColor": "#e03131", + "backgroundColor": "#a5d8ff", + "width": 98.4375, + "height": 33.6, + "seed": 260990948, "groupIds": [], "frameId": null, "roundness": null, - "seed": 1683621212, + "boundElements": [], + "updated": 1705441245931, + "link": null, + "locked": false, + "fontSize": 28, + "fontFamily": 3, + "text": ":10000", + "textAlign": "left", + "verticalAlign": "top", + "containerId": null, + "originalText": ":10000", + "lineHeight": 1.2, + "baseline": 26 + }, + { + "type": "text", "version": 123, "versionNonce": 1961997540, "isDeleted": false, - "boundElements": null, + "id": "nXPshb-tThGBj3OkGgWS9", + "fillStyle": "cross-hatch", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 0, + "opacity": 100, + "angle": 0, + "x": 6667.7574528677405, + "y": -10931.619280941908, + "strokeColor": "#e03131", + "backgroundColor": "#a5d8ff", + "width": 82.03125, + "height": 33.6, + "seed": 1683621212, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], "updated": 1705441309258, "link": null, "locked": false, - "text": ":8080", "fontSize": 28, "fontFamily": 3, + "text": ":8080", "textAlign": "left", "verticalAlign": "top", - "baseline": 26, "containerId": null, "originalText": ":8080", - "lineHeight": 1.2 + "lineHeight": 1.2, + "baseline": 26 } ], "appState": { diff --git a/products/Makefile b/products/Makefile index ac7ce55..1f1fe71 100644 --- a/products/Makefile +++ b/products/Makefile @@ -26,8 +26,7 @@ docker-build: clean docker-run: @docker run \ --name $(CONTAINER_NAME) \ - --publish 3000:3000 \ - --env CONTAINER_NAME="Awesome API server" \ + --publish 4001:4001 \ --env DBPORT=55432 \ --detach \ $(IMAGE_NAME) diff --git a/products/app/cfg/config.go b/products/app/cfg/config.go index d23ffcf..e24fff3 100644 --- a/products/app/cfg/config.go +++ b/products/app/cfg/config.go @@ -6,7 +6,7 @@ import ( type configStruct struct { AppHost string `default:"0.0.0.0"` - AppPort int `default:"3001"` + AppPort int `default:"4001"` DbHost string `default:"localhost"` DbPort int `default:"55432"` DbName string `default:"komponiranje"` diff --git a/proxy/envoy.yaml b/proxy/envoy.yaml index 8747de1..640c83f 100644 --- a/proxy/envoy.yaml +++ b/proxy/envoy.yaml @@ -43,7 +43,7 @@ static_resources: address: socket_address: address: machines-app - port_value: 3000 + port_value: 4000 - name: products-app connect_timeout: 0.25s type: strict_dns @@ -56,7 +56,7 @@ static_resources: address: socket_address: address: products-app - port_value: 3000 + port_value: 4001 admin: access_log_path: "/dev/null" address: