diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000000000000000000000000000000000000..44a8e1b19f0a55ead07d2280b2e6058879e7ec7c --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,10 @@ +--- +image: python:3.9 + +stages: + - build + +build-job: + stage: build + script: + echo "ci-cd" \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 77f308824ae83dd1d72ba4eedeef79b6e2a98446..cdfd6ea64f7192c6db64c2c9062ad2f5c09d7daf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,6 +22,7 @@ "@intlify/unplugin-vue-i18n": "^1.2.0", "@piveau/piveau-hub-ui-modules": "^4.0.25", "@piveau/piveau-universal-piwik": "^3.1.1", + "@primevue/themes": "^4.2.4", "@rdfjs/dataset": "^2.0.1", "@triply/yasgui": "^4.2.25", "@triply/yasqe": "^4.2.23", @@ -49,7 +50,9 @@ "merge-anything": "^2.4.1", "moment": "^2.29.4", "popper.js": "^1.14.3", - "qs": "^6.10.3", + "primeflex": "^3.3.1", + "primeicons": "^7.0.0", + "primevue": "^4.2.4", "vue": "^3.3.8", "vue-head": "^2.1.2", "vue-i18n": "^9.4.0", @@ -2598,6 +2601,71 @@ "node": ">=12" } }, +<<<<<<< HEAD +======= + "node_modules/@primeuix/styled": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@primeuix/styled/-/styled-0.3.2.tgz", + "integrity": "sha512-ColZes0+/WKqH4ob2x8DyNYf1NENpe5ZguOvx5yCLxaP8EIMVhLjWLO/3umJiDnQU4XXMLkn2mMHHw+fhTX/mw==", + "license": "MIT", + "dependencies": { + "@primeuix/utils": "^0.3.2" + }, + "engines": { + "node": ">=12.11.0" + } + }, + "node_modules/@primeuix/utils": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@primeuix/utils/-/utils-0.3.2.tgz", + "integrity": "sha512-B+nphqTQeq+i6JuICLdVWnDMjONome2sNz0xI65qIOyeB4EF12CoKRiCsxuZ5uKAkHi/0d1LqlQ9mIWRSdkavw==", + "license": "MIT", + "engines": { + "node": ">=12.11.0" + } + }, + "node_modules/@primevue/core": { + "version": "4.2.5", + "resolved": "https://registry.npmjs.org/@primevue/core/-/core-4.2.5.tgz", + "integrity": "sha512-+oWBIQs5dLd2Ini4KEVOlvPILk989EHAskiFS3R/dz3jeOllJDMZFcSp8V9ddV0R3yDaPdLVkfHm2Q5t42kU2Q==", + "license": "MIT", + "dependencies": { + "@primeuix/styled": "^0.3.2", + "@primeuix/utils": "^0.3.2" + }, + "engines": { + "node": ">=12.11.0" + }, + "peerDependencies": { + "vue": "^3.3.0" + } + }, + "node_modules/@primevue/icons": { + "version": "4.2.5", + "resolved": "https://registry.npmjs.org/@primevue/icons/-/icons-4.2.5.tgz", + "integrity": "sha512-WFbUMZhQkXf/KmwcytkjGVeJ9aGEDXjP3uweOjQZMmRdEIxFnqYYpd90wE90JE1teZn3+TVnT4ZT7ejGyEXnFQ==", + "license": "MIT", + "dependencies": { + "@primeuix/utils": "^0.3.2", + "@primevue/core": "4.2.5" + }, + "engines": { + "node": ">=12.11.0" + } + }, + "node_modules/@primevue/themes": { + "version": "4.2.5", + "resolved": "https://registry.npmjs.org/@primevue/themes/-/themes-4.2.5.tgz", + "integrity": "sha512-8F7yA36xYIKtNuAuyBdZZEks/bKDwlhH5WjpqGGB0FdwfAEoBYsynQ5sdqcT2Lb/NsajHmS5lc++Ttlvr1g1Lw==", + "license": "MIT", + "dependencies": { + "@primeuix/styled": "^0.3.2" + }, + "engines": { + "node": ">=12.11.0" + } + }, +>>>>>>> 18a9e5a2 "node_modules/@rdfjs/dataset": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/@rdfjs/dataset/-/dataset-2.0.2.tgz", @@ -16577,6 +16645,36 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, +<<<<<<< HEAD +======= + "node_modules/primeflex": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/primeflex/-/primeflex-3.3.1.tgz", + "integrity": "sha512-zaOq3YvcOYytbAmKv3zYc+0VNS9Wg5d37dfxZnveKBFPr7vEIwfV5ydrpiouTft8MVW6qNjfkaQphHSnvgQbpQ==", + "license": "MIT" + }, + "node_modules/primeicons": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/primeicons/-/primeicons-7.0.0.tgz", + "integrity": "sha512-jK3Et9UzwzTsd6tzl2RmwrVY/b8raJ3QZLzoDACj+oTJ0oX7L9Hy+XnVwgo4QVKlKpnP/Ur13SXV/pVh4LzaDw==", + "license": "MIT" + }, + "node_modules/primevue": { + "version": "4.2.5", + "resolved": "https://registry.npmjs.org/primevue/-/primevue-4.2.5.tgz", + "integrity": "sha512-7UMOIJvdFz4jQyhC76yhNdSlHtXvVpmE2JSo2ndUTBWjWJOkYyT562rQ4ayO+bMdJLtzBGqgY64I9ZfEvNd7vQ==", + "license": "MIT", + "dependencies": { + "@primeuix/styled": "^0.3.2", + "@primeuix/utils": "^0.3.2", + "@primevue/core": "4.2.5", + "@primevue/icons": "4.2.5" + }, + "engines": { + "node": ">=12.11.0" + } + }, +>>>>>>> 18a9e5a2 "node_modules/process": { "version": "0.11.10", "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", diff --git a/package.json b/package.json index 1a636d875fe13b3b2c4ed2100a6a83746fe00ec4..37eb48ba39cf74cc95ef7064887e1cd4ec77d22e 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "@intlify/unplugin-vue-i18n": "^1.2.0", "@piveau/piveau-hub-ui-modules": "^4.0.25", "@piveau/piveau-universal-piwik": "^3.1.1", + "@primevue/themes": "^4.2.4", "@rdfjs/dataset": "^2.0.1", "@triply/yasgui": "^4.2.25", "@triply/yasqe": "^4.2.23", @@ -58,7 +59,9 @@ "merge-anything": "^2.4.1", "moment": "^2.29.4", "popper.js": "^1.14.3", - "qs": "^6.10.3", + "primeflex": "^3.3.1", + "primeicons": "^7.0.0", + "primevue": "^4.2.4", "vue": "^3.3.8", "vue-head": "^2.1.2", "vue-i18n": "^9.4.0", diff --git a/src/components/Footer.vue b/src/components/Footer.vue index e3c4a810f72e75a43330ff65705f0d0a5f569fa3..9d6d053019640253c24b273266eeea3d82f6cd8d 100644 --- a/src/components/Footer.vue +++ b/src/components/Footer.vue @@ -3,22 +3,29 @@ <template> <div id="piveau-footer" class="p-5 d-flex justify-content-center"> <div class="w-33"> - <h4>Information</h4> + <h4>KI-Allianz Baden-Württemberg eG</h4> <ul> <li class="mb-2"> - <router-link to="/imprint">Impressum</router-link> - </li> - <li class="mb-2"> - <router-link to="/privacypolicy">Datenschutz</router-link> + <a href="https://ki-allianz.de" target="_blank" rel="noopener noreferrer"><span>Offizielle Website</span></a> </li> </ul> </div> <div class="w-33"> <h4></h4> + </div> <div class="w-33"> - <h4></h4> + <h4>Piveau</h4> + + <ul> + <li class="mb-2"> + <router-link to="/imprint">Impressum</router-link> + </li> + <li class="mb-2"> + <router-link to="/privacypolicy">Datenschutz</router-link> + </li> + </ul> </div> </div> </template> diff --git a/src/components/Header.vue b/src/components/Header.vue index b495d5d99a7c667222f53b40815e02cef2e19d95..16353e4b4781fd55ff8007d4485f6ccb8ba0aede 100644 --- a/src/components/Header.vue +++ b/src/components/Header.vue @@ -2,7 +2,9 @@ <div class="mb-5"> <nav id="piveau-header" class="navbar navbar-expand-lg navbar-dark bg-primary fixed-top" > <slot name="logo"> - <a class="navbar-brand" href="/"><Logo class="piveau-logo"/></a> + <router-link class="navbar-brand" to="/"> + <img src="./icons/kia-logo.png"> + </router-link> </slot> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation"> <span class="navbar-toggler-icon"></span> diff --git a/src/components/Hlrs.vue b/src/components/Hlrs.vue new file mode 100644 index 0000000000000000000000000000000000000000..c116382c3250e8790208917214dc14848d7b16bd --- /dev/null +++ b/src/components/Hlrs.vue @@ -0,0 +1,20 @@ +<template> + <div class="container"> + <h1>HLRS</h1> + <div> + <p> Some information on HPC resources</p> + </div> + </div> +</template> + +<script> +export default { + name: 'Hlrs', + data() { + return {}; + }, + methods: {}, +}; +</script> +<style lang="scss"></style> + diff --git a/src/components/icons/kia-logo.png b/src/components/icons/kia-logo.png new file mode 100755 index 0000000000000000000000000000000000000000..f988e6c181c6fd3c7d7c7fb38a935cb272859547 Binary files /dev/null and b/src/components/icons/kia-logo.png differ diff --git a/src/main.ts b/src/main.ts index 7cedbd30b7c6531d51ea2eb61e2b2575805f0987..19c643410dd96f5fe699bfa029079e3110b60eb5 100644 --- a/src/main.ts +++ b/src/main.ts @@ -14,6 +14,9 @@ import VuePositionSticky from 'vue-position-sticky'; import { createHead } from '@unhead/vue'; import { Skeletor } from 'vue-skeletor'; import 'vue-skeletor/dist/vue-skeletor.css'; +import PrimeVue from 'primevue/config'; +import Button from 'primevue/button'; +import Aura from '@primevue/themes/aura' // Fontawesome library import { library } from '@fortawesome/fontawesome-svg-core'; @@ -34,6 +37,7 @@ import router from './router'; import App from './App'; import Header from './components/Header.vue'; import Footer from './components/Footer.vue'; +import Hlrs from './components/Hlrs.vue'; import vueKeyCloak from "./services/keycloakService"; import UniversalPiwik from '@piveau/piveau-universal-piwik'; @@ -104,6 +108,7 @@ configureModules(app, store, { app.component('piveau-header', Header); app.component('piveau-footer', Footer); +app.component('piveau-hlrs', Hlrs); app.component('InfoSlot', InfoSlot); app.component('ConditionalInput', ConditionalInput); app.component('AutocompleteInput', AutocompleteInput); @@ -112,6 +117,7 @@ app.component('FileUpload', FileUpload); app.component('AppSnackbar', AppSnackbar); app.component('AppConfirmationDialog', AppConfirmationDialog); app.component('font-awesome-icon', FontAwesomeIcon); +app.component('Button', Button); // Vue i18n const LOCALE = env.languages.locale; diff --git a/src/router.js b/src/router.js index 8ce8655e0437e44cf8808d1b64d3ffe7ed8a182d..700b841221ab3952fe5f16cb1e8730e46168740c 100755 --- a/src/router.js +++ b/src/router.js @@ -2,6 +2,7 @@ import * as Router from 'vue-router'; import { watch } from 'vue'; import { glueConfig as GLUE_CONFIG } from '../config/user-config'; +// import {DPIHome} from "@piveau/piveau-hub-ui-modules" import { Auth, DatasetDetailsCategories, @@ -178,6 +179,12 @@ if (GLUE_CONFIG.content.dataProviderInterface.useService) { component: DataFetchingComponent, props: true }), + // router.addRoute({ + // path: '/dpi/home', + // name: "DPI-Home-HappyFlow", + // component: DPIHome, + // props: true + // }), router.addRoute({ path: "/dpi", name: "DataProviderInterface",