Skip to content

Commit

Permalink
Merge pull request #17 from FraunhoferISST/feat/supplierDashboard
Browse files Browse the repository at this point in the history
feat: added supplier dashboard and changed responsiveness in app.vue
  • Loading branch information
mhellmeier authored Aug 17, 2023
2 parents f959530 + 3011a84 commit b81901a
Show file tree
Hide file tree
Showing 6 changed files with 430 additions and 30 deletions.
6 changes: 3 additions & 3 deletions DEPENDENCIES_FRONTEND
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ npm/npmjs/-/rimraf/3.0.2, ISC, approved, clearlydefined
npm/npmjs/-/rollup/2.75.7, MIT, approved, clearlydefined
npm/npmjs/-/run-parallel/1.2.0, MIT, approved, clearlydefined
npm/npmjs/-/select/1.1.2, MIT, approved, clearlydefined
npm/npmjs/-/semver/7.3.7, ISC, approved, clearlydefined
npm/npmjs/-/semver/7.5.4, ISC, approved, clearlydefined
npm/npmjs/-/shebang-command/2.0.0, MIT, approved, clearlydefined
npm/npmjs/-/shebang-regex/3.0.0, MIT, approved, clearlydefined
npm/npmjs/-/source-map-js/1.0.2, BSD-3-Clause, approved, #2412
Expand All @@ -180,13 +180,13 @@ npm/npmjs/-/update-browserslist-db/1.0.4, MIT, approved, #8237
npm/npmjs/-/uri-js/4.4.1, BSD-2-Clause, approved, #1086
npm/npmjs/-/util-deprecate/1.0.2, MIT, approved, #5885
npm/npmjs/-/v8-compile-cache/2.3.0, MIT, approved, clearlydefined
npm/npmjs/-/vite/2.9.13, MIT AND ISC AND Apache-2.0 AND BSD-2-Clause AND CC0-1.0 AND (BSD-3-Clause OR GPL-2.0-only), approved, #5873
npm/npmjs/-/vite/2.9.16, MIT AND ISC AND Apache-2.0 AND BSD-2-Clause AND CC0-1.0 AND (BSD-3-Clause OR GPL-2.0-only), approved, #5873
npm/npmjs/-/vue-eslint-parser/9.0.3, MIT, approved, #5871
npm/npmjs/-/vue-json-viewer/3.0.4, MIT, approved, #5870
npm/npmjs/-/vue-router/4.1.0, MIT, approved, clearlydefined
npm/npmjs/-/vue/3.2.37, MIT, approved, #7094
npm/npmjs/-/which/2.0.2, ISC, approved, clearlydefined
npm/npmjs/-/word-wrap/1.2.3, MIT, approved, clearlydefined
npm/npmjs/-/word-wrap/1.2.5, MIT, approved, clearlydefined
npm/npmjs/-/wrappy/1.0.2, ISC, approved, clearlydefined
npm/npmjs/-/xml-name-validator/4.0.0, Apache-2.0, approved, clearlydefined
npm/npmjs/-/xtend/4.0.2, MIT, approved, clearlydefined
Expand Down
4 changes: 2 additions & 2 deletions backend/src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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}
40 changes: 20 additions & 20 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 18 additions & 5 deletions frontend/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,17 @@ import { RouterLink, RouterView } from "vue-router";
/>Responses</RouterLink
>
</li>
<li>
<RouterLink
class="flex items-center px-4 py-2 text-gray-700 bg-gray-100 dark:text-gray-100 dark:bg-gray-700 rounded-md"
to="/supplierDashboard"
><img
class="mr-2"
src="@/assets/icons/home.svg"
alt="Icon"
/>Supplier Dashboard</RouterLink
>
</li>
</ul>
</aside>
</div>
Expand All @@ -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;
Expand Down Expand Up @@ -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 {
Expand Down
5 changes: 5 additions & 0 deletions frontend/src/router/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,11 @@ const router = createRouter({
name: "stocks",
component: () => import("../views/StockView.vue")
},
{
path: "/supplierDashboard",
name: "supplierDashboard",
component: () => import("../views/SupplierDashboard.vue"),
},
],
});

Expand Down
Loading

0 comments on commit b81901a

Please sign in to comment.