Skip to content

Commit

Permalink
Merge branch 'main' into feat/input_validation
Browse files Browse the repository at this point in the history
  • Loading branch information
eschrewe committed Dec 14, 2023
2 parents 54d4527 + 14e176b commit 8b6dc32
Show file tree
Hide file tree
Showing 7 changed files with 135 additions and 22 deletions.
4 changes: 2 additions & 2 deletions DEPENDENCIES_FRONTEND
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ npm/npmjs/-/micromatch/4.0.5, MIT, approved, clearlydefined
npm/npmjs/-/minimatch/3.1.2, ISC, approved, clearlydefined
npm/npmjs/-/minimist/1.2.6, MIT, approved, #5886
npm/npmjs/-/ms/2.1.2, MIT, approved, #5895
npm/npmjs/-/nanoid/3.3.4, MIT, approved, #7571
npm/npmjs/-/nanoid/3.3.7, MIT, approved, #7571
npm/npmjs/-/natural-compare/1.4.0, MIT, approved, clearlydefined
npm/npmjs/-/node-releases/2.0.5, MIT, approved, #1954
npm/npmjs/-/normalize-path/3.0.0, MIT, approved, clearlydefined
Expand All @@ -143,7 +143,7 @@ npm/npmjs/-/postcss-load-config/3.1.4, MIT, approved, clearlydefined
npm/npmjs/-/postcss-nested/5.0.6, MIT, approved, clearlydefined
npm/npmjs/-/postcss-selector-parser/6.0.10, MIT, approved, #5056
npm/npmjs/-/postcss-value-parser/4.2.0, MIT, approved, clearlydefined
npm/npmjs/-/postcss/8.4.14, MIT, approved, #3545
npm/npmjs/-/postcss/8.4.31, MIT, approved, #3545
npm/npmjs/-/prelude-ls/1.2.1, MIT, approved, clearlydefined
npm/npmjs/-/prettier-linter-helpers/1.0.0, MIT, approved, clearlydefined
npm/npmjs/-/prettier/2.7.1, MIT AND (0BSD AND Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND CC-BY-SA-4.0 AND ISC AND MIT) AND BSD-2-Clause, approved, #3238
Expand Down
8 changes: 4 additions & 4 deletions frontend/DEPENDENCIES
Original file line number Diff line number Diff line change
Expand Up @@ -87,15 +87,15 @@ npm/npmjs/-/flatted/3.2.6, ISC AND (ISC AND MIT), approved, #2430
npm/npmjs/-/fraction.js/4.2.0, MIT, approved, clearlydefined
npm/npmjs/-/fs.realpath/1.0.0, ISC, approved, clearlydefined
npm/npmjs/-/fsevents/2.3.2, MIT, approved, #2967
npm/npmjs/-/function-bind/1.1.1, MIT, approved, clearlydefined
npm/npmjs/-/function-bind/1.1.1, MIT, approved, #11063
npm/npmjs/-/functional-red-black-tree/1.0.1, MIT, approved, clearlydefined
npm/npmjs/-/glob-parent/5.1.2, ISC, approved, clearlydefined
npm/npmjs/-/glob-parent/6.0.2, ISC, approved, clearlydefined
npm/npmjs/-/glob/7.2.3, ISC, approved, clearlydefined
npm/npmjs/-/globals/13.16.0, MIT, approved, clearlydefined
npm/npmjs/-/good-listener/1.2.2, MIT, approved, clearlydefined
npm/npmjs/-/has-flag/4.0.0, MIT, approved, clearlydefined
npm/npmjs/-/has/1.0.3, MIT, approved, clearlydefined
npm/npmjs/-/has/1.0.3, MIT, approved, #10930
npm/npmjs/-/ignore/5.2.0, MIT, approved, #5907
npm/npmjs/-/import-fresh/3.3.0, MIT, approved, clearlydefined
npm/npmjs/-/imurmurhash/0.1.4, MIT, approved, clearlydefined
Expand All @@ -121,7 +121,7 @@ npm/npmjs/-/micromatch/4.0.5, MIT, approved, clearlydefined
npm/npmjs/-/minimatch/3.1.2, ISC, approved, clearlydefined
npm/npmjs/-/minimist/1.2.6, MIT, approved, #5886
npm/npmjs/-/ms/2.1.2, MIT, approved, #5895
npm/npmjs/-/nanoid/3.3.4, MIT, approved, #7571
npm/npmjs/-/nanoid/3.3.7, MIT, approved, #7571
npm/npmjs/-/natural-compare/1.4.0, MIT, approved, clearlydefined
npm/npmjs/-/node-releases/2.0.5, MIT, approved, #1954
npm/npmjs/-/normalize-path/3.0.0, MIT, approved, clearlydefined
Expand All @@ -143,7 +143,7 @@ npm/npmjs/-/postcss-load-config/3.1.4, MIT, approved, clearlydefined
npm/npmjs/-/postcss-nested/5.0.6, MIT, approved, clearlydefined
npm/npmjs/-/postcss-selector-parser/6.0.10, MIT, approved, #5056
npm/npmjs/-/postcss-value-parser/4.2.0, MIT, approved, clearlydefined
npm/npmjs/-/postcss/8.4.14, MIT, approved, #3545
npm/npmjs/-/postcss/8.4.31, MIT, approved, #3545
npm/npmjs/-/prelude-ls/1.2.1, MIT, approved, clearlydefined
npm/npmjs/-/prettier-linter-helpers/1.0.0, MIT, approved, clearlydefined
npm/npmjs/-/prettier/2.7.1, MIT AND (0BSD AND Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND CC-BY-SA-4.0 AND ISC AND MIT) AND BSD-2-Clause, approved, #3238
Expand Down
38 changes: 24 additions & 14 deletions frontend/package-lock.json

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

17 changes: 16 additions & 1 deletion frontend/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
-->

<script setup>
import { RouterLink, RouterView } from "vue-router";
import {RouterLink, RouterView} from "vue-router";
</script>

<template>
Expand Down Expand Up @@ -149,6 +149,12 @@ import { RouterLink, RouterView } from "vue-router";
</ul>
</aside>
</div>
<div class="mt-auto mr-auto ml-auto" id="about-license">
<RouterLink
class="font-semibold disable"
to="/aboutLicense"
>About License</RouterLink>
</div>
</div>
<div class="sm:ml-64 lg:ml-0 content-center overflow-auto">
<RouterView />
Expand Down Expand Up @@ -221,6 +227,12 @@ nav a:first-of-type {
place-items: center;
}

@media (max-height: 665px) {
#about-license{
margin-top: 0.313rem;
}
}

#app {
//display: grid;
//grid-template-columns: 1fr 1fr;
Expand Down Expand Up @@ -254,4 +266,7 @@ nav a:first-of-type {
margin-top: 1rem;
}
}
.disable:hover{
background: unset !important;
}
</style>
30 changes: 30 additions & 0 deletions frontend/src/assets/aboutPage.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
[
{
"header": "Product Name",
"body": "PURIS",
"link": "https://github.com/eclipse-tractusx/puris"
},
{
"header": "License",
"body": "Apache-2.0"
},
{
"header": "License Path",
"body": "License URL",
"link": "https://github.com/eclipse-tractusx/puris/blob/main/LICENSE"
},
{
"header": "NOTICE",
"body": "Notice.md URL",
"link": "https://github.com/eclipse-tractusx/puris/blob/main/NOTICE.md"
},
{
"header": "Source URL",
"body": "Eclipse-Tractus-X",
"link": "https://github.com/eclipse-tractusx"
},
{
"header": "Commit ID",
"body": "187698ada492dbe171e5ffcf12c9d2194e53fbfa"
}
]
7 changes: 6 additions & 1 deletion frontend/src/router/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,18 @@ const router = createRouter({
{
path: "/stocks",
name: "stocks",
component: () => import("../views/StockView.vue")
component: () => import("../views/StockView.vue"),
},
{
path: "/supplierDashboard",
name: "supplierDashboard",
component: () => import("../views/SupplierDashboard.vue"),
},
{
path: "/aboutLicense",
name: "aboutLicense",
component: () => import("../views/AboutLicense.vue"),
},
],
});

Expand Down
53 changes: 53 additions & 0 deletions frontend/src/views/AboutLicense.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<!--
Copyright (c) 2022,2023 Volkswagen AG
Copyright (c) 2022,2023 Contributors to the Eclipse Foundation

See the NOTICE file(s) distributed with this work for additional
information regarding copyright ownership.

This program and the accompanying materials are made available under the
terms of the Apache License, Version 2.0 which is available at
https://www.apache.org/licenses/LICENSE-2.0.

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
License for the specific language governing permissions and limitations
under the License.

SPDX-License-Identifier: Apache-2.0
-->
<script>
import aboutPage from '@/assets/aboutPage.json';

export default {
data() {
return {
information: aboutPage,
};
},
};
</script>
<template>
<main>
<div class="text-gray-900 grid bg-white rounded-lg border border-gray-200 shadow-md hover:bg-gray-100 dark:bg-gray-800 dark:border-gray-700 dark:hover:bg-gray-700 w-[100%] overflow-auto p-2.5">
<table>
<tr v-for="item in information" :id="item.header">
<td class="font-bold">{{item.header}}</td>
<td>
<a v-if="item.hasOwnProperty('link')" :href="item.link" id="fakelink">{{item.body}}</a>
<p v-else> {{item.body}}</p>
</td>
</tr>
</table>
</div>
</main>
</template>
<style scoped>
#fakelink{
color: #0000EE;
}
#fakelink:hover{
color: #0000FF;
}
</style>

0 comments on commit 8b6dc32

Please sign in to comment.