From b34cd6f471eb2ff23306b4f1b9a69858af00cbf7 Mon Sep 17 00:00:00 2001 From: Pascal Marzec Date: Wed, 2 Aug 2023 13:12:40 +0200 Subject: [PATCH] feat: added supplier dashboard and changed responsiveness in app.vue --- .../src/main/resources/application.properties | 4 +- frontend/package-lock.json | 40 +- frontend/src/App.vue | 23 +- frontend/src/router/index.js | 5 + frontend/src/views/SupplierDashboard.vue | 362 ++++++++++++++++++ 5 files changed, 407 insertions(+), 27 deletions(-) create mode 100644 frontend/src/views/SupplierDashboard.vue diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties index 7b3195fe..80649646 100755 --- a/backend/src/main/resources/application.properties +++ b/backend/src/main/resources/application.properties @@ -16,7 +16,7 @@ server.servlet.context-path=${API_ROOTDIR:/catena} # EDC Config edc.controlplane.host=${EDC_CONTROLPLANE_HOST:172.17.0.2} -edc.controlplane.data.port=${EDC_CONTROLPLANE_DATA_PORT:32125} +edc.controlplane.data.port=${EDC_CONTROLPLANE_DATA_PORT:31960} edc.controlplane.key=${EDC_CONTROLPLANE_KEY:password} -edc.backend.url=${EDC_BACKEND_URL:http://172.17.0.2:30888} +edc.backend.url=${EDC_BACKEND_URL:http://172.17.0.2:31048} minikube.ip=${MINIKUBE_IP:host.minikube.internal} diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 172849f2..39a83792 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -2240,9 +2240,9 @@ "integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA==" }, "node_modules/semver": { - "version": "7.3.7", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", - "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "dependencies": { "lru-cache": "^6.0.0" @@ -2479,15 +2479,15 @@ "dev": true }, "node_modules/vite": { - "version": "2.9.13", - "resolved": "https://registry.npmjs.org/vite/-/vite-2.9.13.tgz", - "integrity": "sha512-AsOBAaT0AD7Mhe8DuK+/kE4aWYFMx/i0ZNi98hJclxb4e0OhQcZYUrvLjIaQ8e59Ui7txcvKMiJC1yftqpQoDw==", + "version": "2.9.16", + "resolved": "https://registry.npmjs.org/vite/-/vite-2.9.16.tgz", + "integrity": "sha512-X+6q8KPyeuBvTQV8AVSnKDvXoBMnTx8zxh54sOwmmuOdxkjMmEJXH2UEchA+vTMps1xw9vL64uwJOWryULg7nA==", "dev": true, "dependencies": { "esbuild": "^0.14.27", "postcss": "^8.4.13", "resolve": "^1.22.0", - "rollup": "^2.59.0" + "rollup": ">=2.59.0 <2.78.0" }, "bin": { "vite": "bin/vite.js" @@ -2592,9 +2592,9 @@ } }, "node_modules/word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", "dev": true, "engines": { "node": ">=0.10.0" @@ -4146,9 +4146,9 @@ "integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA==" }, "semver": { - "version": "7.3.7", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", - "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "requires": { "lru-cache": "^6.0.0" @@ -4311,16 +4311,16 @@ "dev": true }, "vite": { - "version": "2.9.13", - "resolved": "https://registry.npmjs.org/vite/-/vite-2.9.13.tgz", - "integrity": "sha512-AsOBAaT0AD7Mhe8DuK+/kE4aWYFMx/i0ZNi98hJclxb4e0OhQcZYUrvLjIaQ8e59Ui7txcvKMiJC1yftqpQoDw==", + "version": "2.9.16", + "resolved": "https://registry.npmjs.org/vite/-/vite-2.9.16.tgz", + "integrity": "sha512-X+6q8KPyeuBvTQV8AVSnKDvXoBMnTx8zxh54sOwmmuOdxkjMmEJXH2UEchA+vTMps1xw9vL64uwJOWryULg7nA==", "dev": true, "requires": { "esbuild": "^0.14.27", "fsevents": "~2.3.2", "postcss": "^8.4.13", "resolve": "^1.22.0", - "rollup": "^2.59.0" + "rollup": ">=2.59.0 <2.78.0" } }, "vue": { @@ -4376,9 +4376,9 @@ } }, "word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", "dev": true }, "wrappy": { diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 2e3f443c..270be6b5 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -135,6 +135,17 @@ import { RouterLink, RouterView } from "vue-router"; />Responses +
  • + IconSupplier Dashboard +
    • @@ -150,7 +161,7 @@ import { RouterLink, RouterView } from "vue-router"; #app { max-width: 1280px; - margin: 0 auto; + margin: 0px auto 0px 16rem; padding: 2rem; font-weight: normal; @@ -204,16 +215,18 @@ nav a:first-of-type { border: 0; } -@media (min-width: 1024px) { +@media (min-width: 1500px) { body { display: flex; place-items: center; } #app { - //display: grid; - grid-template-columns: 1fr 1fr; - padding: 0 2rem; + //display: grid; + //grid-template-columns: 1fr 1fr; + margin: 0 auto; + max-width: calc(100% - 32rem); + padding: 0 2rem; } header { diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js index 2c532986..7b824939 100644 --- a/frontend/src/router/index.js +++ b/frontend/src/router/index.js @@ -73,6 +73,11 @@ const router = createRouter({ name: "stocks", component: () => import("../views/StockView.vue") }, + { + path: "/supplierDashboard", + name: "supplierDashboard", + component: () => import("../views/SupplierDashboard.vue"), + }, ], }); diff --git a/frontend/src/views/SupplierDashboard.vue b/frontend/src/views/SupplierDashboard.vue new file mode 100644 index 00000000..b22da3ee --- /dev/null +++ b/frontend/src/views/SupplierDashboard.vue @@ -0,0 +1,362 @@ + + + + +