From 00b8b94a619289b28810f675c1281345ff64473e Mon Sep 17 00:00:00 2001 From: Patrizio Bekerle <patrizio.bekerle@tugraz.at> Date: Tue, 14 Jul 2020 14:40:48 +0200 Subject: [PATCH] Refactoring vpu to dbp (dbp/web-components/toolkit#2) --- .gitlab-ci.yml | 2 +- .gitlab-ci/README.md | 2 +- .gitlab-ci/build.sh | 2 +- package-lock.json | 2 +- package.json | 2 +- packages/app-shell/.gitlab-ci.yml | 4 +- packages/app-shell/.gitmodules | 10 +- packages/app-shell/README.md | 12 +- .../app-shell/assets/example.metadata.json | 4 +- packages/app-shell/assets/index.html | 4 +- packages/app-shell/package.json | 12 +- packages/app-shell/rollup.config.js | 4 +- packages/app-shell/src/app-shell.js | 58 ++++---- packages/app-shell/src/auth-menu-button.js | 20 +-- packages/app-shell/src/build-info.js | 2 +- ...ity-example.js => dbp-activity-example.js} | 4 +- ...ll-welcome.js => dbp-app-shell-welcome.js} | 8 +- packages/app-shell/src/dbp-app-shell.js | 4 + packages/app-shell/src/i18n.js | 2 +- packages/app-shell/src/tugraz-logo.js | 2 +- packages/app-shell/src/vpu-app-shell.js | 4 - packages/auth/.gitlab-ci.yml | 4 +- packages/auth/README.md | 24 ++-- packages/auth/assets/index.html | 4 +- packages/auth/package.json | 4 +- packages/auth/rollup.config.js | 4 +- packages/auth/src/auth-keycloak.js | 54 ++++---- .../{vpu-auth-demo.js => dbp-auth-demo.js} | 22 +-- packages/auth/src/dbp-auth.js | 6 + packages/auth/src/demo.js | 2 +- packages/auth/src/i18n.js | 2 +- packages/auth/src/keycloak.js | 2 +- packages/auth/src/login-button.js | 12 +- packages/auth/src/vpu-auth.js | 6 - packages/auth/test/unit.js | 16 +-- packages/common/.gitlab-ci.yml | 4 +- packages/common/.gitlab-ci/README.md | 2 +- packages/common/.gitlab-ci/build.sh | 2 +- packages/common/README.md | 4 +- packages/common/assets/index.html | 2 +- ...{vpu-common-demo.js => dbp-common-demo.js} | 80 +++++------ ...{vpu-lit-element.js => dbp-lit-element.js} | 2 +- packages/common/demo.js | 2 +- packages/common/jsonld.js | 8 +- packages/common/notification.js | 4 +- packages/common/package.json | 2 +- packages/common/src/button.js | 6 +- packages/common/src/eventbus.js | 2 +- packages/common/src/icon.js | 2 +- packages/common/styles.js | 126 +++++++++--------- packages/common/test/eventbus.js | 6 +- packages/data-table-view/.gitlab-ci.yml | 4 +- packages/data-table-view/.gitmodules | 4 +- packages/data-table-view/README.md | 22 +-- packages/data-table-view/assets/index.html | 4 +- packages/data-table-view/package.json | 6 +- packages/data-table-view/rollup.config.js | 14 +- .../data-table-view/src/data-table-view.js | 28 ++-- ...ew-demo.js => dbp-data-table-view-demo.js} | 28 ++-- .../src/dbp-data-table-view.js | 4 + packages/data-table-view/src/demo.js | 2 +- .../src/vpu-data-table-view.js | 4 - packages/data-table-view/test/unit.js | 12 +- .../.gitlab-ci.yml | 2 +- .../.gitmodules | 4 +- .../README.md | 14 +- .../assets/index.html | 6 +- .../package.json | 6 +- .../rollup.config.js | 4 +- ...wledge-base-web-page-element-view-demo.js} | 26 ++-- ...p-knowledge-base-web-page-element-view.js} | 4 +- .../src/i18n.js | 2 +- .../knowledge-base-web-page-element-view.js | 14 +- .../test/unit.js | 12 +- packages/language-select/.gitlab-ci.yml | 2 +- packages/language-select/.gitmodules | 2 +- packages/language-select/README.md | 4 +- packages/language-select/assets/index.html | 4 +- packages/language-select/package.json | 4 +- packages/language-select/rollup.config.js | 2 +- ...ct-demo.js => dbp-language-select-demo.js} | 20 +-- .../src/dbp-language-select.js | 4 + packages/language-select/src/demo.js | 2 +- packages/language-select/src/i18n.js | 2 +- .../language-select/src/language-select.js | 18 +-- .../src/vpu-language-select.js | 4 - packages/language-select/test/unit.js | 14 +- packages/notification/.gitlab-ci.yml | 2 +- packages/notification/.gitmodules | 2 +- packages/notification/README.md | 8 +- packages/notification/assets/index.html | 4 +- packages/notification/package.json | 4 +- packages/notification/rollup.config.js | 2 +- ...ation-demo.js => dbp-notification-demo.js} | 12 +- packages/notification/src/dbp-notification.js | 4 + packages/notification/src/i18n.js | 2 +- packages/notification/src/notification.js | 12 +- packages/notification/src/vpu-notification.js | 4 - packages/notification/test/unit.js | 6 +- packages/person-profile/.gitlab-ci.yml | 2 +- packages/person-profile/.gitmodules | 6 +- packages/person-profile/README.md | 12 +- packages/person-profile/assets/index.html | 4 +- packages/person-profile/package.json | 8 +- packages/person-profile/rollup.config.js | 4 +- ...ile-demo.js => dbp-person-profile-demo.js} | 38 +++--- .../person-profile/src/dbp-person-profile.js | 4 + packages/person-profile/src/i18n.js | 2 +- packages/person-profile/src/person-profile.js | 12 +- .../person-profile/src/vpu-person-profile.js | 4 - packages/person-profile/test/unit.js | 6 +- packages/person-select/.gitlab-ci.yml | 2 +- packages/person-select/.gitmodules | 4 +- packages/person-select/README.md | 20 +-- packages/person-select/assets/index.html | 4 +- packages/person-select/package.json | 6 +- packages/person-select/rollup.config.js | 4 +- ...lect-demo.js => dbp-person-select-demo.js} | 22 +-- .../person-select/src/dbp-person-select.js | 4 + packages/person-select/src/demo.js | 2 +- packages/person-select/src/i18n.js | 2 +- packages/person-select/src/person-select.js | 24 ++-- .../person-select/src/vpu-person-select.js | 4 - packages/person-select/test/unit.js | 10 +- 124 files changed, 580 insertions(+), 580 deletions(-) rename packages/app-shell/src/{vpu-activity-example.js => dbp-activity-example.js} (87%) rename packages/app-shell/src/{vpu-app-shell-welcome.js => dbp-app-shell-welcome.js} (92%) create mode 100644 packages/app-shell/src/dbp-app-shell.js delete mode 100644 packages/app-shell/src/vpu-app-shell.js rename packages/auth/src/{vpu-auth-demo.js => dbp-auth-demo.js} (81%) create mode 100644 packages/auth/src/dbp-auth.js delete mode 100644 packages/auth/src/vpu-auth.js rename packages/common/{vpu-common-demo.js => dbp-common-demo.js} (58%) rename packages/common/{vpu-lit-element.js => dbp-lit-element.js} (76%) rename packages/data-table-view/src/{vpu-data-table-view-demo.js => dbp-data-table-view-demo.js} (90%) create mode 100644 packages/data-table-view/src/dbp-data-table-view.js delete mode 100644 packages/data-table-view/src/vpu-data-table-view.js rename packages/knowledge-base-web-page-element-view/src/{vpu-knowledge-base-web-page-element-view-demo.js => dbp-knowledge-base-web-page-element-view-demo.js} (72%) rename packages/knowledge-base-web-page-element-view/src/{vpu-knowledge-base-web-page-element-view.js => dbp-knowledge-base-web-page-element-view.js} (54%) rename packages/language-select/src/{vpu-language-select-demo.js => dbp-language-select-demo.js} (62%) create mode 100644 packages/language-select/src/dbp-language-select.js delete mode 100644 packages/language-select/src/vpu-language-select.js rename packages/notification/src/{vpu-notification-demo.js => dbp-notification-demo.js} (85%) create mode 100644 packages/notification/src/dbp-notification.js delete mode 100644 packages/notification/src/vpu-notification.js rename packages/person-profile/src/{vpu-person-profile-demo.js => dbp-person-profile-demo.js} (66%) create mode 100644 packages/person-profile/src/dbp-person-profile.js delete mode 100644 packages/person-profile/src/vpu-person-profile.js rename packages/person-select/src/{vpu-person-select-demo.js => dbp-person-select-demo.js} (73%) create mode 100644 packages/person-select/src/dbp-person-select.js delete mode 100644 packages/person-select/src/vpu-person-select.js diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6f289b8d..a59af6e3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: registry.gitlab.tugraz.at/vpu/webcomponents/dbp-toolkit/main:v1 +image: registry.gitlab.tugraz.at/dbp/webcomponents/toolkit/main:v1 stages: - test diff --git a/.gitlab-ci/README.md b/.gitlab-ci/README.md index 2022ef26..f0ee4d37 100644 --- a/.gitlab-ci/README.md +++ b/.gitlab-ci/README.md @@ -1,4 +1,4 @@ * In case of an incompatible change increase the tag version number in build.sh * ./build.sh * (first time) sudo docker login registry.gitlab.tugraz.at -* sudo docker push registry.gitlab.tugraz.at/vpu/webcomponents/toolkit/main:v1 \ No newline at end of file +* sudo docker push registry.gitlab.tugraz.at/dbp/webcomponents/toolkit/main:v1 \ No newline at end of file diff --git a/.gitlab-ci/build.sh b/.gitlab-ci/build.sh index e6456a4f..50a55878 100755 --- a/.gitlab-ci/build.sh +++ b/.gitlab-ci/build.sh @@ -1,6 +1,6 @@ #!/bin/bash set -e -TAG="registry.gitlab.tugraz.at/vpu/webcomponents/dbp-toolkit/main:v1" +TAG="registry.gitlab.tugraz.at/dbp/webcomponents/toolkit/main:v1" sudo docker build --tag "${TAG}" --file "Dockerfile" . echo "Now run: sudo docker push '$TAG'" diff --git a/package-lock.json b/package-lock.json index d44190e1..73c7e031 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "vpu-toolkit", + "name": "dbp-toolkit", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index 529326b4..77762b83 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "vpu-toolkit", + "name": "dbp-toolkit", "version": "1.0.0", "description": "", "main": "index.js", diff --git a/packages/app-shell/.gitlab-ci.yml b/packages/app-shell/.gitlab-ci.yml index 891533dd..3b416f43 100644 --- a/packages/app-shell/.gitlab-ci.yml +++ b/packages/app-shell/.gitlab-ci.yml @@ -1,7 +1,7 @@ -image: registry.gitlab.tugraz.at/vpu/webcomponents/common/main:v5 +image: registry.gitlab.tugraz.at/dbp/webcomponents/common/main:v5 before_script: - - "sed -i 's|git@gitlab.tugraz.at:VPU|../..|g' .gitmodules" + - "sed -i 's|git@gitlab.tugraz.at:dbp|../..|g' .gitmodules" - git submodule sync - git submodule update --init diff --git a/packages/app-shell/.gitmodules b/packages/app-shell/.gitmodules index 94f3fdc5..df96310e 100644 --- a/packages/app-shell/.gitmodules +++ b/packages/app-shell/.gitmodules @@ -1,15 +1,15 @@ [submodule "vendor/auth"] path = vendor/auth - url = git@gitlab.tugraz.at:VPU/WebComponents/Auth.git + url = git@gitlab.tugraz.at:dbp/web-components/Auth.git [submodule "vendor/common"] path = vendor/common - url = git@gitlab.tugraz.at:VPU/WebComponents/Common + url = git@gitlab.tugraz.at:dbp/web-components/Common [submodule "vendor/notification"] path = vendor/notification - url = git@gitlab.tugraz.at:VPU/WebComponents/Notification + url = git@gitlab.tugraz.at:dbp/web-components/Notification [submodule "vendor/language-select"] path = vendor/language-select - url = git@gitlab.tugraz.at:VPU/WebComponents/LanguageSelect + url = git@gitlab.tugraz.at:dbp/web-components/LanguageSelect [submodule "vendor/person-profile"] path = vendor/person-profile - url = git@gitlab.tugraz.at:VPU/WebComponents/PersonProfile + url = git@gitlab.tugraz.at:dbp/web-components/PersonProfile diff --git a/packages/app-shell/README.md b/packages/app-shell/README.md index dd8f2cbe..56d41014 100644 --- a/packages/app-shell/README.md +++ b/packages/app-shell/README.md @@ -1,6 +1,6 @@ # App Shell Component -[GitLab Repository](https://gitlab.tugraz.at/VPU/Apps/AppShell) +[GitLab Repository](https://gitlab.tugraz.at/dbp/apps/AppShell) A web component for building SPAs consisting of one topic with multiple activities. Handles login, language selection, activity switching, menus etc. @@ -8,13 +8,13 @@ activities. Handles login, language selection, activity switching, menus etc. ## Usage ```html -<vpu-app-shell src="/example.topic.metadata.json"></vpu-app-shell> +<dbp-app-shell src="/example.topic.metadata.json"></dbp-app-shell> ``` ## Attributes - `lang` (optional, default: `de`): set to `de` or `en` for German or English - - example `<vpu-app-shell lang="de" </vpu-app-shell>` + - example `<dbp-app-shell lang="de" </dbp-app-shell>` - `src`: The path to a topic metadata file (json) - `base-path` (optional, default: `/`: An absolute base path for routing - `entry-point-url`: Entry point URL to access the API @@ -48,8 +48,8 @@ activities. Handles login, language selection, activity switching, menus etc. ```json { - "element": "vpu-activity-example", - "module_src": "vpu-activity-example.js", + "element": "dbp-activity-example", + "module_src": "dbp-activity-example.js", "routing_name": "activity-example", "name": { "de": "Beispielaktivität", @@ -70,7 +70,7 @@ activities. Handles login, language selection, activity switching, menus etc. ```bash # get the source -git clone git@gitlab.tugraz.at:VPU/Apps/AppShell.git +git clone git@gitlab.tugraz.at:dbp/apps/AppShell.git cd AppShell git submodule update --init diff --git a/packages/app-shell/assets/example.metadata.json b/packages/app-shell/assets/example.metadata.json index 1bf5ace2..ab2e0978 100644 --- a/packages/app-shell/assets/example.metadata.json +++ b/packages/app-shell/assets/example.metadata.json @@ -1,6 +1,6 @@ { - "element": "vpu-activity-example", - "module_src": "vpu-activity-example.js", + "element": "dbp-activity-example", + "module_src": "dbp-activity-example.js", "routing_name": "activity-example", "name": { "de": "Beispielaktivität", diff --git a/packages/app-shell/assets/index.html b/packages/app-shell/assets/index.html index d3bc8319..45b8b474 100644 --- a/packages/app-shell/assets/index.html +++ b/packages/app-shell/assets/index.html @@ -10,12 +10,12 @@ } </style> - <script type="module" src="/vpu-app-shell.js"></script> + <script type="module" src="/dbp-app-shell.js"></script> </head> <body> -<vpu-app-shell keycloak-config='{"url": "https://auth-dev.tugraz.at/auth", "realm": "tugraz", "clientId": "auth-dev-mw-frontend-local", "silentCheckSsoRedirectUri": "/silent-check-sso.html"}' src="/example.topic.metadata.json"></vpu-app-shell> +<dbp-app-shell keycloak-config='{"url": "https://auth-dev.tugraz.at/auth", "realm": "tugraz", "clientId": "auth-dev-mw-frontend-local", "silentCheckSsoRedirectUri": "/silent-check-sso.html"}' src="/example.topic.metadata.json"></dbp-app-shell> </body> </html> \ No newline at end of file diff --git a/packages/app-shell/package.json b/packages/app-shell/package.json index 53a6fd4e..a965b8bd 100644 --- a/packages/app-shell/package.json +++ b/packages/app-shell/package.json @@ -1,5 +1,5 @@ { - "name": "vpu-app-shell", + "name": "dbp-app-shell", "version": "1.0.0", "main": "src/index.js", "license": "LGPL-2.1-or-later", @@ -24,11 +24,11 @@ "rollup-plugin-copy": "^3.1.0", "rollup-plugin-delete": "^2.0.0", "rollup-plugin-serve": "^1.0.1", - "vpu-auth": "^1.0.0", - "vpu-common": "^1.0.0", - "vpu-language-select": "^1.0.0", - "vpu-notification": "^1.0.0", - "vpu-person-profile": "^1.0.0" + "dbp-auth": "^1.0.0", + "dbp-common": "^1.0.0", + "dbp-language-select": "^1.0.0", + "dbp-notification": "^1.0.0", + "dbp-person-profile": "^1.0.0" }, "dependencies": { "@open-wc/scoped-elements": "^1.1.1", diff --git a/packages/app-shell/rollup.config.js b/packages/app-shell/rollup.config.js index 2c854509..254f320b 100644 --- a/packages/app-shell/rollup.config.js +++ b/packages/app-shell/rollup.config.js @@ -30,7 +30,7 @@ function getBuildInfo() { } export default { - input: (build !='test') ? ['src/vpu-app-shell.js', 'src/vpu-activity-example.js'] : glob.sync('test/**/*.js'), + input: (build !='test') ? ['src/dbp-app-shell.js', 'src/dbp-activity-example.js'] : glob.sync('test/**/*.js'), output: { dir: 'dist', entryFileNames: '[name].js', @@ -65,7 +65,7 @@ export default { {src: 'assets/silent-check-sso.html', dest:'dist'}, {src: 'assets/index.html', dest: 'dist'}, {src: 'assets/*.json', dest: 'dist'}, - {src: 'node_modules/vpu-common/assets/icons/*.svg', dest: 'dist/local/vpu-common/icons'}, + {src: 'node_modules/dbp-common/assets/icons/*.svg', dest: 'dist/local/dbp-common/icons'}, ], }), (process.env.ROLLUP_WATCH === 'true') ? serve({ diff --git a/packages/app-shell/src/app-shell.js b/packages/app-shell/src/app-shell.js index f63d3be5..d2451f5b 100644 --- a/packages/app-shell/src/app-shell.js +++ b/packages/app-shell/src/app-shell.js @@ -1,20 +1,20 @@ import {createI18nInstance} from './i18n.js'; import {html, css, LitElement} from 'lit-element'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; -import {LanguageSelect} from 'vpu-language-select'; -import {Icon, EventBus} from 'vpu-common'; -import {AuthKeycloak} from 'vpu-auth'; +import {LanguageSelect} from 'dbp-language-select'; +import {Icon, EventBus} from 'dbp-common'; +import {AuthKeycloak} from 'dbp-auth'; import {AuthMenuButton} from './auth-menu-button.js'; -import {Notification} from 'vpu-notification'; -import * as commonStyles from 'vpu-common/styles'; -import * as commonUtils from 'vpu-common/utils'; +import {Notification} from 'dbp-notification'; +import * as commonStyles from 'dbp-common/styles'; +import * as commonUtils from 'dbp-common/utils'; import buildinfo from 'consts:buildinfo'; import {classMap} from 'lit-html/directives/class-map.js'; import {Router} from './router.js'; import {BuildInfo} from './build-info.js'; import {TUGrazLogo} from './tugraz-logo.js'; -import {send as notify} from 'vpu-common/notification'; -import {appWelcomeMeta} from './vpu-app-shell-welcome.js'; +import {send as notify} from 'dbp-common/notification'; +import {appWelcomeMeta} from './dbp-app-shell-welcome.js'; const i18n = createI18nInstance(); @@ -63,13 +63,13 @@ export class AppShell extends ScopedElementsMixin(LitElement) { static get scopedElements() { return { - 'vpu-language-select': LanguageSelect, - 'vpu-tugraz-logo': TUGrazLogo, - 'vpu-build-info': BuildInfo, - 'vpu-auth-keycloak': AuthKeycloak, - 'vpu-auth-menu-button': AuthMenuButton, - 'vpu-notification': Notification, - 'vpu-icon': Icon, + 'dbp-language-select': LanguageSelect, + 'dbp-tugraz-logo': TUGrazLogo, + 'dbp-build-info': BuildInfo, + 'dbp-auth-keycloak': AuthKeycloak, + 'dbp-auth-menu-button': AuthMenuButton, + 'dbp-notification': Notification, + 'dbp-icon': Icon, }; } @@ -78,7 +78,7 @@ export class AppShell extends ScopedElementsMixin(LitElement) { if (mutation.type === 'attributes') { const key = mutation.attributeName; const value = mutation.target.getAttribute(key); - sessionStorage.setItem('vpu-attr-' + key, value); + sessionStorage.setItem('dbp-attr-' + key, value); } } } @@ -137,7 +137,7 @@ export class AppShell extends ScopedElementsMixin(LitElement) { metadata = Object.assign(metadata, { "welcome": appWelcomeMeta, }); - customElements.get("vpu-app-shell-welcome").app = this; + customElements.get("dbp-app-shell-welcome").app = this; // this also triggers a rebuilding of the menu this.metadata = metadata; @@ -265,7 +265,7 @@ export class AppShell extends ScopedElementsMixin(LitElement) { this.lang = lang; this.router.update(); - const event = new CustomEvent("vpu-language-changed", { + const event = new CustomEvent("dbp-language-changed", { bubbles: true, detail: {'lang': lang} }); @@ -544,8 +544,8 @@ export class AppShell extends ScopedElementsMixin(LitElement) { } .menu a.selected { - color: var(--vpu-light); - background-color: var(--vpu-dark); + color: var(--dbp-light); + background-color: var(--dbp-dark); } aside .subtitle { @@ -646,7 +646,7 @@ export class AppShell extends ScopedElementsMixin(LitElement) { _onActivityAdded(element) { for(const key of this.topic.attributes || []) { - let value = sessionStorage.getItem('vpu-attr-' + key); + let value = sessionStorage.getItem('dbp-attr-' + key); if (value !== null) { element.setAttribute(key, value); } @@ -712,18 +712,18 @@ export class AppShell extends ScopedElementsMixin(LitElement) { return html` <slot class="${slotClassMap}"></slot> - <vpu-auth-keycloak lang="${this.lang}" url="${kc.url}" realm="${kc.realm}" client-id="${kc.clientId}" silent-check-sso-redirect-uri="${kc.silentCheckSsoRedirectUri || ''}" scope="${kc.scope || ''}" load-person try-login></vpu-auth-keycloak> + <dbp-auth-keycloak lang="${this.lang}" url="${kc.url}" realm="${kc.realm}" client-id="${kc.clientId}" silent-check-sso-redirect-uri="${kc.silentCheckSsoRedirectUri || ''}" scope="${kc.scope || ''}" load-person try-login></dbp-auth-keycloak> <div class="${mainClassMap}"> <div id="main"> - <vpu-notification lang="${this.lang}"></vpu-notification> + <dbp-notification lang="${this.lang}"></dbp-notification> <header> <div class="hd1-left"> - <vpu-language-select @vpu-language-changed=${this.onLanguageChanged.bind(this)}></vpu-language-select> + <dbp-language-select @dbp-language-changed=${this.onLanguageChanged.bind(this)}></dbp-language-select> </div> <div class="hd1-middle"> </div> <div class="hd1-right"> - <vpu-auth-menu-button class="auth-button" lang="${this.lang}"></vpu-auth-menu-button> + <dbp-auth-menu-button class="auth-button" lang="${this.lang}"></dbp-auth-menu-button> </div> <div class="hd2-left"> <div class="header"> @@ -731,7 +731,7 @@ export class AppShell extends ScopedElementsMixin(LitElement) { </div> </div> <div class="hd2-right"> - <vpu-tugraz-logo id="main-logo" lang="${this.lang}"></vpu-tugraz-logo> + <dbp-tugraz-logo id="main-logo" lang="${this.lang}"></dbp-tugraz-logo> </div> </header> @@ -742,11 +742,11 @@ export class AppShell extends ScopedElementsMixin(LitElement) { <aside> <h2 class="subtitle" @click="${this.toggleMenu}"> ${this.subtitle} - <vpu-icon name="chevron-down" style="color: red" id="menu-chevron-icon"></vpu-icon> + <dbp-icon name="chevron-down" style="color: red" id="menu-chevron-icon"></dbp-icon> </h2> <ul class="menu hidden"> ${menuTemplates} - <li class="close" @click="${this.hideMenu}"><vpu-icon name="close" style="color: red"></vpu-icon></li> + <li class="close" @click="${this.hideMenu}"><dbp-icon name="close" style="color: red"></dbp-icon></li> </ul> </aside> @@ -759,7 +759,7 @@ export class AppShell extends ScopedElementsMixin(LitElement) { <a target="_blank" rel="noopener" class="int-link-external" href="https://datenschutz.tugraz.at/erklaerung/">${i18n.t('privacy-policy')}</a> <a target="_blank" rel="noopener" class="int-link-external" href="${imprintUrl}">${i18n.t('imprint')}</a> <a rel="noopener" class="int-link-external" href="mailto:it-support@tugraz.at">${i18n.t('contact')}</a> - <vpu-build-info class="${prodClassMap}"></vpu-build-info> + <dbp-build-info class="${prodClassMap}"></dbp-build-info> </footer> </div> </div> diff --git a/packages/app-shell/src/auth-menu-button.js b/packages/app-shell/src/auth-menu-button.js index d0fcd0e1..ec472141 100644 --- a/packages/app-shell/src/auth-menu-button.js +++ b/packages/app-shell/src/auth-menu-button.js @@ -2,9 +2,9 @@ import {createI18nInstance} from './i18n.js'; import {html, css} from 'lit-element'; import {unsafeHTML} from 'lit-html/directives/unsafe-html.js'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; -import * as commonStyles from 'vpu-common/styles'; +import * as commonStyles from 'dbp-common/styles'; import {LitElement} from "lit-element"; -import {Icon, EventBus} from 'vpu-common'; +import {Icon, EventBus} from 'dbp-common'; const i18n = createI18nInstance(); @@ -23,7 +23,7 @@ export class AuthMenuButton extends ScopedElementsMixin(LitElement) { static get scopedElements() { return { - 'vpu-icon': Icon, + 'dbp-icon': Icon, }; } @@ -109,8 +109,8 @@ export class AuthMenuButton extends ScopedElementsMixin(LitElement) { } img { - border-width: var(--vpu-border-width); - border-color: var(--vpu-dark); + border-width: var(--dbp-border-width); + border-color: var(--dbp-dark); border-style: solid; } @@ -125,7 +125,7 @@ export class AuthMenuButton extends ScopedElementsMixin(LitElement) { position: absolute; z-index: 20; border: solid 1px black; - border-radius: var(--vpu-border-radius); + border-radius: var(--dbp-border-radius); overflow: hidden; background-color: white; } @@ -193,8 +193,8 @@ export class AuthMenuButton extends ScopedElementsMixin(LitElement) { } .login-button:hover { - background-color: var(--vpu-dark); - color: var(--vpu-light); + background-color: var(--dbp-dark); + color: var(--dbp-light); cursor: pointer; transition: none; } @@ -205,7 +205,7 @@ export class AuthMenuButton extends ScopedElementsMixin(LitElement) { } .login-box:hover svg path { - fill: var(--vpu-light); + fill: var(--dbp-light); } .login-box .label { @@ -258,7 +258,7 @@ export class AuthMenuButton extends ScopedElementsMixin(LitElement) { <a href="#"> <div class="dropdown-trigger login-button"> <div class="name">${this._loginData.name}</div> - <vpu-icon class="menu-icon" name="chevron-down" id="menu-chevron-icon"></vpu-icon> + <dbp-icon class="menu-icon" name="chevron-down" id="menu-chevron-icon"></dbp-icon> </div> </a> <div class="dropdown-menu" id="dropdown-menu2" role="menu"> diff --git a/packages/app-shell/src/build-info.js b/packages/app-shell/src/build-info.js index faac3a38..c5007704 100644 --- a/packages/app-shell/src/build-info.js +++ b/packages/app-shell/src/build-info.js @@ -1,5 +1,5 @@ import {html, LitElement, css} from 'lit-element'; -import * as commonStyles from 'vpu-common/styles'; +import * as commonStyles from 'dbp-common/styles'; import buildinfo from 'consts:buildinfo'; export class BuildInfo extends LitElement { diff --git a/packages/app-shell/src/vpu-activity-example.js b/packages/app-shell/src/dbp-activity-example.js similarity index 87% rename from packages/app-shell/src/vpu-activity-example.js rename to packages/app-shell/src/dbp-activity-example.js index f4be9f9f..da716938 100644 --- a/packages/app-shell/src/vpu-activity-example.js +++ b/packages/app-shell/src/dbp-activity-example.js @@ -1,6 +1,6 @@ import {html , LitElement} from 'lit-element'; import {createI18nInstance} from './i18n.js'; -import * as commonUtils from 'vpu-common/utils'; +import * as commonUtils from 'dbp-common/utils'; const i18n = createI18nInstance(); @@ -36,4 +36,4 @@ class ActivityExample extends LitElement { } } -commonUtils.defineCustomElement('vpu-activity-example', ActivityExample); +commonUtils.defineCustomElement('dbp-activity-example', ActivityExample); diff --git a/packages/app-shell/src/vpu-app-shell-welcome.js b/packages/app-shell/src/dbp-app-shell-welcome.js similarity index 92% rename from packages/app-shell/src/vpu-app-shell-welcome.js rename to packages/app-shell/src/dbp-app-shell-welcome.js index 114ceb48..ccd96a98 100644 --- a/packages/app-shell/src/vpu-app-shell-welcome.js +++ b/packages/app-shell/src/dbp-app-shell-welcome.js @@ -1,8 +1,8 @@ import {createI18nInstance} from './i18n.js'; import {css, html, LitElement} from 'lit-element'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; -import * as commonUtils from 'vpu-common/utils'; -import * as commonStyles from 'vpu-common/styles'; +import * as commonUtils from 'dbp-common/utils'; +import * as commonStyles from 'dbp-common/styles'; const i18n = createI18nInstance(); @@ -80,7 +80,7 @@ class AppShellWelcome extends ScopedElementsMixin(LitElement) { } export const appWelcomeMeta = { - "element": "vpu-app-shell-welcome", + "element": "dbp-app-shell-welcome", "module_src": "", "routing_name": "welcome", "name": { @@ -98,4 +98,4 @@ export const appWelcomeMeta = { visible: true }; -commonUtils.defineCustomElement('vpu-app-shell-welcome', AppShellWelcome); +commonUtils.defineCustomElement('dbp-app-shell-welcome', AppShellWelcome); diff --git a/packages/app-shell/src/dbp-app-shell.js b/packages/app-shell/src/dbp-app-shell.js new file mode 100644 index 00000000..cea329a0 --- /dev/null +++ b/packages/app-shell/src/dbp-app-shell.js @@ -0,0 +1,4 @@ +import {AppShell} from './app-shell.js'; +import * as commonUtils from 'dbp-common/utils'; + +commonUtils.defineCustomElement('dbp-app-shell', AppShell); \ No newline at end of file diff --git a/packages/app-shell/src/i18n.js b/packages/app-shell/src/i18n.js index 51af2ff5..8bec8abb 100644 --- a/packages/app-shell/src/i18n.js +++ b/packages/app-shell/src/i18n.js @@ -1,4 +1,4 @@ -import {createInstance} from 'vpu-common/i18next.js'; +import {createInstance} from 'dbp-common/i18next.js'; import de from './i18n/de/translation.json'; import en from './i18n/en/translation.json'; diff --git a/packages/app-shell/src/tugraz-logo.js b/packages/app-shell/src/tugraz-logo.js index a77614c3..0f0d783c 100644 --- a/packages/app-shell/src/tugraz-logo.js +++ b/packages/app-shell/src/tugraz-logo.js @@ -1,5 +1,5 @@ import {html, LitElement, css} from 'lit-element'; -import * as commonStyles from 'vpu-common/styles'; +import * as commonStyles from 'dbp-common/styles'; import {createI18nInstance} from './i18n.js'; const i18n = createI18nInstance(); diff --git a/packages/app-shell/src/vpu-app-shell.js b/packages/app-shell/src/vpu-app-shell.js deleted file mode 100644 index bea278d6..00000000 --- a/packages/app-shell/src/vpu-app-shell.js +++ /dev/null @@ -1,4 +0,0 @@ -import {AppShell} from './app-shell.js'; -import * as commonUtils from 'vpu-common/utils'; - -commonUtils.defineCustomElement('vpu-app-shell', AppShell); \ No newline at end of file diff --git a/packages/auth/.gitlab-ci.yml b/packages/auth/.gitlab-ci.yml index 41502e66..352b5f42 100644 --- a/packages/auth/.gitlab-ci.yml +++ b/packages/auth/.gitlab-ci.yml @@ -1,7 +1,7 @@ -image: registry.gitlab.tugraz.at/vpu/webcomponents/common/main:v1 +image: registry.gitlab.tugraz.at/dbp/webcomponents/common/main:v1 before_script: - - "sed -i 's|git@gitlab.tugraz.at:VPU|../..|g' .gitmodules" + - "sed -i 's|git@gitlab.tugraz.at:dbp|../..|g' .gitmodules" - git submodule sync - git submodule update --init diff --git a/packages/auth/README.md b/packages/auth/README.md index 67c756ae..ee4c69be 100644 --- a/packages/auth/README.md +++ b/packages/auth/README.md @@ -1,27 +1,27 @@ # Auth Web Components -[GitLab Repository](https://gitlab.tugraz.at/VPU/WebComponents/Auth) +[GitLab Repository](https://gitlab.tugraz.at/dbp/web-components/Auth) ## Keycloak Component ### Usage ```html -<vpu-auth-keycloak url="https://auth.tugraz.at/auth" realm="tugraz" client-id="some-id"></vpu-auth-keycloak> +<dbp-auth-keycloak url="https://auth.tugraz.at/auth" realm="tugraz" client-id="some-id"></dbp-auth-keycloak> ``` ### Attributes - `lang` (optional, default: `de`): set to `de` or `en` for German or English - - example `<vpu-auth-keycloak lang="de" </vpu-auth-keycloak>` + - example `<dbp-auth-keycloak lang="de" </dbp-auth-keycloak>` - `load-person` (optional, default: off): if enabled the logged in user will also be loaded as `Person` - in the `window.VPUPerson` variable - - example `<vpu-auth-keycloak load-person></vpu-auth-keycloak>` + in the `window.DBPPerson` variable + - example `<dbp-auth-keycloak load-person></dbp-auth-keycloak>` - `force-login` (optional, default: off): if enabled a login will be forced, there never will be a login button - - example `<vpu-auth-keycloak force-login></vpu-auth-keycloak>` + - example `<dbp-auth-keycloak force-login></dbp-auth-keycloak>` - `try-login` (optional, default: off): if enabled the a login will happen if the user is already logged in and finishing the login process would not result in a page location change (reload/redirect). - - example `<vpu-auth-keycloak try-login></vpu-auth-keycloak>` + - example `<dbp-auth-keycloak try-login></dbp-auth-keycloak>` ### Keycloak Specific Attributes @@ -33,23 +33,23 @@ ### Events to listen to -- `vpu-auth-init`: Keycloak init event - happens once -- `vpu-auth-person-init`: Keycloak person init event - the person entity was loaded from the server -- `vpu-auth-keycloak-data-update`: Keycloak data was updated - happens for example every time after a token refresh +- `dbp-auth-init`: Keycloak init event - happens once +- `dbp-auth-person-init`: Keycloak person init event - the person entity was loaded from the server +- `dbp-auth-keycloak-data-update`: Keycloak data was updated - happens for example every time after a token refresh ## Login Button ### Usage ```html -<vpu-login-button></vpu-login-button> +<dbp-login-button></dbp-login-button> ``` ## Local development ```bash # get the source -git clone git@gitlab.tugraz.at:VPU/WebComponents/Auth.git +git clone git@gitlab.tugraz.at:dbp/web-components/Auth.git cd Auth git submodule update --init diff --git a/packages/auth/assets/index.html b/packages/auth/assets/index.html index e0e08c3c..e77189cd 100644 --- a/packages/auth/assets/index.html +++ b/packages/auth/assets/index.html @@ -2,12 +2,12 @@ <html> <head> <meta charset="UTF-8"> - <script type="module" src="vpu-auth-demo.js"></script> + <script type="module" src="dbp-auth-demo.js"></script> </head> <body> -<vpu-auth-demo lang="de"></vpu-auth-demo> +<dbp-auth-demo lang="de"></dbp-auth-demo> </body> </html> diff --git a/packages/auth/package.json b/packages/auth/package.json index 0d60eaf7..624b9a48 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -1,5 +1,5 @@ { - "name": "vpu-auth", + "name": "dbp-auth", "version": "1.0.0", "main": "src/index.js", "license": "LGPL-2.1-or-later", @@ -30,7 +30,7 @@ "rollup-plugin-json": "^4.0.0", "rollup-plugin-serve": "^1.0.1", "rollup-plugin-terser": "^6.1.0", - "vpu-common": "^1.0.0" + "dbp-common": "^1.0.0" }, "dependencies": { "@open-wc/scoped-elements": "^1.1.1", diff --git a/packages/auth/rollup.config.js b/packages/auth/rollup.config.js index cb3a46fc..b199dd8e 100644 --- a/packages/auth/rollup.config.js +++ b/packages/auth/rollup.config.js @@ -14,7 +14,7 @@ console.log("build: " + build); export default { - input: (build != 'test') ? ['src/vpu-auth.js', 'src/vpu-auth-demo.js'] : glob.sync('test/**/*.js'), + input: (build != 'test') ? ['src/dbp-auth.js', 'src/dbp-auth-demo.js'] : glob.sync('test/**/*.js'), output: { dir: 'dist', entryFileNames: '[name].js', @@ -49,7 +49,7 @@ export default { {src: 'assets/index.html', dest:'dist'}, {src: 'assets/silent-check-sso.html', dest: 'dist/local/' + pkg.name}, {src: 'assets/favicon.ico', dest:'dist'}, - {src: 'node_modules/vpu-common/assets/icons/*.svg', dest: 'dist/local/vpu-common/icons'}, + {src: 'node_modules/dbp-common/assets/icons/*.svg', dest: 'dist/local/dbp-common/icons'}, ] }), (process.env.ROLLUP_WATCH === 'true') ? serve({contentBase: 'dist', host: '127.0.0.1', port: 8002}) : false diff --git a/packages/auth/src/auth-keycloak.js b/packages/auth/src/auth-keycloak.js index 85749938..96630f09 100644 --- a/packages/auth/src/auth-keycloak.js +++ b/packages/auth/src/auth-keycloak.js @@ -1,7 +1,7 @@ import {i18n} from './i18n.js'; -import JSONLD from 'vpu-common/jsonld'; -import * as commonUtils from 'vpu-common/utils'; -import {EventBus} from 'vpu-common'; +import JSONLD from 'dbp-common/jsonld'; +import * as commonUtils from 'dbp-common/utils'; +import {EventBus} from 'dbp-common'; import {KeycloakWrapper} from './keycloak.js'; import {LitElement} from "lit-element"; import {LoginStatus} from './util.js'; @@ -11,14 +11,14 @@ import {LoginStatus} from './util.js'; * Keycloak auth web component * https://www.keycloak.org/docs/latest/securing_apps/index.html#_javascript_adapter * - * Dispatches an event `vpu-auth-init` and sets some global variables: - * window.VPUAuthSubject: Keycloak username - * window.VPUAuthToken: Keycloak token to send with your requests - * window.VPUAuthTokenParsed: Keycloak token content - * window.VPUUserFullName: Full name of the user - * window.VPUPersonId: Person identifier of the user - * window.VPUPerson: Person json object of the user (optional, enable by setting the `load-person` attribute, - * which will dispatch a `vpu-auth-person-init` event when loaded) + * Dispatches an event `dbp-auth-init` and sets some global variables: + * window.DBPAuthSubject: Keycloak username + * window.DBPAuthToken: Keycloak token to send with your requests + * window.DBPAuthTokenParsed: Keycloak token content + * window.DBPUserFullName: Full name of the user + * window.DBPPersonId: Person identifier of the user + * window.DBPPerson: Person json object of the user (optional, enable by setting the `load-person` attribute, + * which will dispatch a `dbp-auth-person-init` event when loaded) */ export class AuthKeycloak extends LitElement { constructor() { @@ -44,9 +44,9 @@ export class AuthKeycloak extends LitElement { this.scope = null; // Create the events - this.initEvent = new CustomEvent("vpu-auth-init", { "detail": "KeyCloak init event", bubbles: true, composed: true }); - this.personInitEvent = new CustomEvent("vpu-auth-person-init", { "detail": "KeyCloak person init event", bubbles: true, composed: true }); - this.keycloakDataUpdateEvent = new CustomEvent("vpu-auth-keycloak-data-update", { "detail": "KeyCloak data was updated", bubbles: true, composed: true }); + this.initEvent = new CustomEvent("dbp-auth-init", { "detail": "KeyCloak init event", bubbles: true, composed: true }); + this.personInitEvent = new CustomEvent("dbp-auth-person-init", { "detail": "KeyCloak person init event", bubbles: true, composed: true }); + this.keycloakDataUpdateEvent = new CustomEvent("dbp-auth-keycloak-data-update", { "detail": "KeyCloak data was updated", bubbles: true, composed: true }); this._onKCChanged = this._onKCChanged.bind(this); } @@ -79,12 +79,12 @@ export class AuthKeycloak extends LitElement { } this.personId = personId; - window.VPUAuthSubject = this.subject; - window.VPUAuthToken = this.token; - window.VPUAuthTokenParsed = this.tokenParsed; - window.VPUUserFullName = this.name; - window.VPUPersonId = this.personId; - window.VPUPerson = this.person; + window.DBPAuthSubject = this.subject; + window.DBPAuthToken = this.token; + window.DBPAuthTokenParsed = this.tokenParsed; + window.DBPUserFullName = this.name; + window.DBPPersonId = this.personId; + window.DBPPerson = this.person; this._setLoginStatus(LoginStatus.LOGGED_IN, tokenChanged || newPerson); } else { @@ -98,12 +98,12 @@ export class AuthKeycloak extends LitElement { this.personId = ""; this.person = null; - window.VPUAuthSubject = this.subject; - window.VPUAuthToken = this.token; - window.VPUAuthTokenParsed = this.tokenParsed; - window.VPUUserFullName = this.name; - window.VPUPersonId = this.personId; - window.VPUPerson = this.person; + window.DBPAuthSubject = this.subject; + window.DBPAuthToken = this.token; + window.DBPAuthTokenParsed = this.tokenParsed; + window.DBPUserFullName = this.name; + window.DBPPersonId = this.personId; + window.DBPPerson = this.person; this._setLoginStatus(LoginStatus.LOGGED_OUT); } @@ -130,7 +130,7 @@ export class AuthKeycloak extends LitElement { .then(response => response.json()) .then((person) => { that.person = person; - window.VPUPerson = person; + window.DBPPerson = person; that.dispatchEvent(that.personInitEvent); this._setLoginStatus(this._loginStatus, true); }); diff --git a/packages/auth/src/vpu-auth-demo.js b/packages/auth/src/dbp-auth-demo.js similarity index 81% rename from packages/auth/src/vpu-auth-demo.js rename to packages/auth/src/dbp-auth-demo.js index 40c77d83..f9e8530a 100644 --- a/packages/auth/src/vpu-auth-demo.js +++ b/packages/auth/src/dbp-auth-demo.js @@ -3,7 +3,7 @@ import {html, LitElement} from 'lit-element'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import {AuthKeycloak} from './auth-keycloak.js'; import {LoginButton} from './login-button.js'; -import * as commonUtils from 'vpu-common/utils'; +import * as commonUtils from 'dbp-common/utils'; class AuthDemo extends ScopedElementsMixin(LitElement) { constructor() { @@ -13,8 +13,8 @@ class AuthDemo extends ScopedElementsMixin(LitElement) { static get scopedElements() { return { - 'vpu-auth-keycloak': AuthKeycloak, - 'vpu-login-button': LoginButton, + 'dbp-auth-keycloak': AuthKeycloak, + 'dbp-login-button': LoginButton, }; } @@ -35,7 +35,7 @@ class AuthDemo extends ScopedElementsMixin(LitElement) { } async _onUserInfoClick() { - if (!window.VPUAuthToken) { + if (!window.DBPAuthToken) { console.error("not logged in"); return; } @@ -46,7 +46,7 @@ class AuthDemo extends ScopedElementsMixin(LitElement) { userInfoURL, { headers: { 'Content-Type': 'application/json', - 'Authorization': 'Bearer ' + window.VPUAuthToken + 'Authorization': 'Bearer ' + window.DBPAuthToken } } ); @@ -54,16 +54,16 @@ class AuthDemo extends ScopedElementsMixin(LitElement) { } async _onShowToken() { - if (!window.VPUAuthToken) { + if (!window.DBPAuthToken) { console.error("not logged in"); return; } - console.log(window.VPUAuthTokenParsed); + console.log(window.DBPAuthTokenParsed); } render() { - const silentCheckSsoUri = commonUtils.getAssetURL('vpu-auth', 'silent-check-sso.html'); + const silentCheckSsoUri = commonUtils.getAssetURL('dbp-auth', 'silent-check-sso.html'); return html` <style> /* from BULMA.CSS */ @@ -90,9 +90,9 @@ class AuthDemo extends ScopedElementsMixin(LitElement) { <h1 class="title">Auth-Demo</h1> </div> <div class="container"> - <vpu-auth-keycloak lang="${this.lang}" url="https://auth-dev.tugraz.at/auth" realm="tugraz" client-id="auth-dev-mw-frontend-local" silent-check-sso-redirect-uri="${silentCheckSsoUri}" scope="optional-test-scope" load-person try-login></vpu-auth-keycloak> + <dbp-auth-keycloak lang="${this.lang}" url="https://auth-dev.tugraz.at/auth" realm="tugraz" client-id="auth-dev-mw-frontend-local" silent-check-sso-redirect-uri="${silentCheckSsoUri}" scope="optional-test-scope" load-person try-login></dbp-auth-keycloak> - <vpu-login-button lang="${this.lang}" show-image></vpu-login-button> + <dbp-login-button lang="${this.lang}" show-image></dbp-login-button> </div> </section> @@ -102,4 +102,4 @@ class AuthDemo extends ScopedElementsMixin(LitElement) { } } -commonUtils.defineCustomElement('vpu-auth-demo', AuthDemo); +commonUtils.defineCustomElement('dbp-auth-demo', AuthDemo); diff --git a/packages/auth/src/dbp-auth.js b/packages/auth/src/dbp-auth.js new file mode 100644 index 00000000..58137a21 --- /dev/null +++ b/packages/auth/src/dbp-auth.js @@ -0,0 +1,6 @@ +import {defineCustomElement} from 'dbp-common/utils'; +import {AuthKeycloak} from './auth-keycloak.js'; +import {LoginButton} from './login-button.js'; + +defineCustomElement('dbp-auth-keycloak', AuthKeycloak); +defineCustomElement('dbp-login-button', LoginButton); diff --git a/packages/auth/src/demo.js b/packages/auth/src/demo.js index a6c2fa31..3fdf20a2 100644 --- a/packages/auth/src/demo.js +++ b/packages/auth/src/demo.js @@ -1 +1 @@ -import './vpu-auth-demo'; +import './dbp-auth-demo'; diff --git a/packages/auth/src/i18n.js b/packages/auth/src/i18n.js index 02c88eb4..3fb3a1af 100644 --- a/packages/auth/src/i18n.js +++ b/packages/auth/src/i18n.js @@ -1,4 +1,4 @@ -import {createInstance} from 'vpu-common/i18next.js'; +import {createInstance} from 'dbp-common/i18next.js'; import de from './i18n/de/translation.json'; import en from './i18n/en/translation.json'; diff --git a/packages/auth/src/keycloak.js b/packages/auth/src/keycloak.js index 7b5930b4..6a995c66 100644 --- a/packages/auth/src/keycloak.js +++ b/packages/auth/src/keycloak.js @@ -103,7 +103,7 @@ export class KeycloakWrapper extends EventTarget { } async _keycloakInit(options) { - // https://gitlab.tugraz.at/VPU/Apps/Library/issues/41 + // https://gitlab.tugraz.at/dbp/apps/library/issues/41 // retry the keycloak init in case it fails, maybe it helps :/ try { return await this._keycloak.init(options); diff --git a/packages/auth/src/login-button.js b/packages/auth/src/login-button.js index 265ccf4e..73e6323c 100644 --- a/packages/auth/src/login-button.js +++ b/packages/auth/src/login-button.js @@ -2,9 +2,9 @@ import {i18n} from './i18n.js'; import {html, css} from 'lit-element'; import {unsafeHTML} from 'lit-html/directives/unsafe-html.js'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; -import * as commonStyles from 'vpu-common/styles'; +import * as commonStyles from 'dbp-common/styles'; import {LitElement} from "lit-element"; -import {Icon, EventBus} from 'vpu-common'; +import {Icon, EventBus} from 'dbp-common'; import {LoginStatus} from './util.js'; let logoutSVG = ` @@ -62,7 +62,7 @@ export class LoginButton extends ScopedElementsMixin(LitElement) { static get scopedElements() { return { - 'vpu-icon': Icon, + 'dbp-icon': Icon, }; } @@ -136,12 +136,12 @@ export class LoginButton extends ScopedElementsMixin(LitElement) { } .login-box:hover svg path { - fill: var(--vpu-light); + fill: var(--dbp-light); } .login-box:hover { - background-color: var(--vpu-dark); - color: var(--vpu-light); + background-color: var(--dbp-dark); + color: var(--dbp-light); cursor: pointer; transition: none; } diff --git a/packages/auth/src/vpu-auth.js b/packages/auth/src/vpu-auth.js deleted file mode 100644 index 5201d004..00000000 --- a/packages/auth/src/vpu-auth.js +++ /dev/null @@ -1,6 +0,0 @@ -import {defineCustomElement} from 'vpu-common/utils'; -import {AuthKeycloak} from './auth-keycloak.js'; -import {LoginButton} from './login-button.js'; - -defineCustomElement('vpu-auth-keycloak', AuthKeycloak); -defineCustomElement('vpu-login-button', LoginButton); diff --git a/packages/auth/test/unit.js b/packages/auth/test/unit.js index 1ccba94d..fee5e7c5 100644 --- a/packages/auth/test/unit.js +++ b/packages/auth/test/unit.js @@ -1,13 +1,13 @@ import {assert} from 'chai'; -import '../src/vpu-auth'; -import '../src/vpu-auth-demo'; +import '../src/dbp-auth'; +import '../src/dbp-auth-demo'; -suite('vpu-auth basics', () => { +suite('dbp-auth basics', () => { let node; suiteSetup(async () => { - node = document.createElement('vpu-auth-keycloak'); + node = document.createElement('dbp-auth-keycloak'); node.setAttribute('url', 'someurl'); node.setAttribute('realm', 'somerealm'); node.setAttribute('client-id', 'someId'); @@ -24,11 +24,11 @@ suite('vpu-auth basics', () => { }); }); -suite('vpu-login-button', () => { +suite('dbp-login-button', () => { let node; suiteSetup(async () => { - node = document.createElement('vpu-login-button'); + node = document.createElement('dbp-login-button'); document.body.appendChild(node); await node.updateComplete; }); @@ -42,11 +42,11 @@ suite('vpu-login-button', () => { }); }); -suite('vpu-auth-demo basics', () => { +suite('dbp-auth-demo basics', () => { let node; suiteSetup(async () => { - node = document.createElement('vpu-auth-demo'); + node = document.createElement('dbp-auth-demo'); document.body.appendChild(node); await node.updateComplete; }); diff --git a/packages/common/.gitlab-ci.yml b/packages/common/.gitlab-ci.yml index 5cd14136..23107272 100644 --- a/packages/common/.gitlab-ci.yml +++ b/packages/common/.gitlab-ci.yml @@ -1,7 +1,7 @@ -image: registry.gitlab.tugraz.at/vpu/webcomponents/common/main:v6 +image: registry.gitlab.tugraz.at/dbp/webcomponents/common/main:v6 before_script: - - "sed -i 's|git@gitlab.tugraz.at:VPU|../..|g' .gitmodules" + - "sed -i 's|git@gitlab.tugraz.at:dbp|../..|g' .gitmodules" - git submodule sync - git submodule update --init diff --git a/packages/common/.gitlab-ci/README.md b/packages/common/.gitlab-ci/README.md index b23781f9..83e1f344 100644 --- a/packages/common/.gitlab-ci/README.md +++ b/packages/common/.gitlab-ci/README.md @@ -1,4 +1,4 @@ * In case of an incompatible change increase the tag version number in build.sh * ./build.sh * (first time) sudo docker login registry.gitlab.tugraz.at -* sudo docker push registry.gitlab.tugraz.at/vpu/webcomponents/common/main:v1 \ No newline at end of file +* sudo docker push registry.gitlab.tugraz.at/dbp/webcomponents/common/main:v1 \ No newline at end of file diff --git a/packages/common/.gitlab-ci/build.sh b/packages/common/.gitlab-ci/build.sh index be587c08..4924a28a 100755 --- a/packages/common/.gitlab-ci/build.sh +++ b/packages/common/.gitlab-ci/build.sh @@ -1,6 +1,6 @@ #!/bin/bash set -e -TAG="registry.gitlab.tugraz.at/vpu/webcomponents/common/main:v6" +TAG="registry.gitlab.tugraz.at/dbp/webcomponents/common/main:v6" sudo docker build --tag "${TAG}" --file "Dockerfile" . echo "Now run: sudo docker push '$TAG'" diff --git a/packages/common/README.md b/packages/common/README.md index 7edf0e8d..01af717c 100644 --- a/packages/common/README.md +++ b/packages/common/README.md @@ -1,11 +1,11 @@ # Common Code -[GitLab Repository](https://gitlab.tugraz.at/VPU/WebComponents/Common) +[GitLab Repository](https://gitlab.tugraz.at/dbp/web-components/Common) ## Icon Web Component For valid icon names see: [LineIcons](https://lineicons.com/icons/) ```html - <vpu-icon color="orange" name="menu-down"></vpu-icon> + <dbp-icon color="orange" name="menu-down"></dbp-icon> ``` diff --git a/packages/common/assets/index.html b/packages/common/assets/index.html index 9469485c..1e833122 100644 --- a/packages/common/assets/index.html +++ b/packages/common/assets/index.html @@ -10,6 +10,6 @@ </style> </head> <body> -<vpu-common-demo></vpu-common-demo> +<dbp-common-demo></dbp-common-demo> </body> </html> diff --git a/packages/common/vpu-common-demo.js b/packages/common/dbp-common-demo.js similarity index 58% rename from packages/common/vpu-common-demo.js rename to packages/common/dbp-common-demo.js index 16b12d91..d36d13fb 100644 --- a/packages/common/vpu-common-demo.js +++ b/packages/common/dbp-common-demo.js @@ -5,7 +5,7 @@ import * as commonUtils from './utils.js'; import * as commonStyles from './styles.js'; import {getIconCSS, Icon, MiniSpinner, Button, Spinner} from './index.js'; -class VpuCommonDemo extends ScopedElementsMixin(LitElement) { +class DbpCommonDemo extends ScopedElementsMixin(LitElement) { constructor() { super(); this.lang = 'de'; @@ -14,11 +14,11 @@ class VpuCommonDemo extends ScopedElementsMixin(LitElement) { static get scopedElements() { return { - 'vpu-icon': Icon, - 'vpu-mini-spinner': MiniSpinner, - 'vpu-spinner': Spinner, - 'vpu-button': Button, - 'vpu-auth': customElements.get('vpu-auth'), + 'dbp-icon': Icon, + 'dbp-mini-spinner': MiniSpinner, + 'dbp-spinner': Spinner, + 'dbp-button': Button, + 'dbp-auth': customElements.get('dbp-auth'), }; } @@ -80,14 +80,14 @@ class VpuCommonDemo extends ScopedElementsMixin(LitElement) { getAuthComponentHtml() { return this.noAuth ? html`` : html` <div class="container"> - <vpu-auth lang="${this.lang}" load-person></vpu-auth> + <dbp-auth lang="${this.lang}" load-person></dbp-auth> </div> `; } buttonClickHandler() { setTimeout(() => { - this.shadowRoot.querySelector("vpu-button").stop(); + this.shadowRoot.querySelector("dbp-button").stop(); }, 1000); } @@ -106,59 +106,59 @@ class VpuCommonDemo extends ScopedElementsMixin(LitElement) { <div class="content"> <h2>Mini Spinner</h2> <div class="control"> - <vpu-mini-spinner text="Loading..."></vpu-mini-spinner> - <vpu-mini-spinner></vpu-mini-spinner> - <vpu-mini-spinner style="font-size: 2em"></vpu-mini-spinner> - <vpu-mini-spinner style="font-size: 3em"></vpu-mini-spinner> + <dbp-mini-spinner text="Loading..."></dbp-mini-spinner> + <dbp-mini-spinner></dbp-mini-spinner> + <dbp-mini-spinner style="font-size: 2em"></dbp-mini-spinner> + <dbp-mini-spinner style="font-size: 3em"></dbp-mini-spinner> </div> </div> <div class="content"> <h2>Spinner</h2> <div class="control"> - <vpu-spinner></vpu-spinner> + <dbp-spinner></dbp-spinner> </div> </div> <div class="content"> <h2>Icons</h2> <div class="control"> - <p style="text-decoration: underline">Foo <vpu-icon name="cloudnetwork"></vpu-icon> bar</p> - <p style="font-size: 2em;">Foo <vpu-icon name="cloudnetwork"></vpu-icon> bar</p> - <p style="font-size: 2em; color: orange">Foo <vpu-icon name="cloudnetwork"></vpu-icon> bar</p> + <p style="text-decoration: underline">Foo <dbp-icon name="cloudnetwork"></dbp-icon> bar</p> + <p style="font-size: 2em;">Foo <dbp-icon name="cloudnetwork"></dbp-icon> bar</p> + <p style="font-size: 2em; color: orange">Foo <dbp-icon name="cloudnetwork"></dbp-icon> bar</p> <span style="background-color: #000"><a href="#" style=" color: #fff">foobar</a></span> - <p style="font-size: 2em; color: orange">Foo <vpu-icon name="information"></vpu-icon> bar</p> + <p style="font-size: 2em; color: orange">Foo <dbp-icon name="information"></dbp-icon> bar</p> <br> - ${(new Array(100).fill(0)).map(i => html`<vpu-icon style="color: green; width: 50px; height: 50px; border: #000 solid 1px"name="happy"></vpu-icon>`)} + ${(new Array(100).fill(0)).map(i => html`<dbp-icon style="color: green; width: 50px; height: 50px; border: #000 solid 1px"name="happy"></dbp-icon>`)} </div> </div> <div class="content"> <h2>Button</h2> <div class="control"> - <vpu-button value="Load" @click="${this.buttonClickHandler}" type="is-primary"></vpu-button> + <dbp-button value="Load" @click="${this.buttonClickHandler}" type="is-primary"></dbp-button> </div> </div> <div class="content"> <h2>Theming CSS API</h2> <div class="control"> <ul> - <li><code>--vpu-primary-bg-color</code>: Primary background color <div class="demoblock" style="background-color: var(--vpu-primary-bg-color)"></div></li> - <li><code>--vpu-primary-text-color</code>: Primary text color <div class="demoblock" style="background-color: var(--vpu-primary-bg-color); color: var(--vpu-primary-text-color)">X</div></li> - <li><code>--vpu-secondary-bg-color</code>: Secondary background color <div class="demoblock" style="background-color: var(--vpu-secondary-bg-color)"></div></li> - <li><code>--vpu-secondary-text-color</code>: Secondary text color <div class="demoblock" style="background-color: var(--vpu-secondary-bg-color); color: var(--vpu-secondary-text-color)">X</div></li> - <li><code>--vpu-info-bg-color</code>: Info background color <div class="demoblock" style="background-color: var(--vpu-info-bg-color)"></div></li> - <li><code>--vpu-info-text-color</code>: Info text color <div class="demoblock" style="background-color: var(--vpu-info-bg-color); color: var(--vpu-info-text-color)">X</div></li> - <li><code>--vpu-success-bg-color</code>: Success background color <div class="demoblock" style="background-color: var(--vpu-success-bg-color)"></div></li> - <li><code>--vpu-success-text-color</code>: Success text color <div class="demoblock" style="background-color: var(--vpu-success-bg-color); color: var(--vpu-success-text-color)">X</div></li> - <li><code>--vpu-warning-bg-color</code>: Warning background color <div class="demoblock" style="background-color: var(--vpu-warning-bg-color)"></div></li> - <li><code>--vpu-warning-text-color</code>: Warning text color <div class="demoblock" style="background-color: var(--vpu-warning-bg-color); color: var(--vpu-warning-text-color)">X</div></li> - <li><code>--vpu-danger-bg-color</code>: Danger background color <div class="demoblock" style="background-color: var(--vpu-danger-bg-color)"></div></li> - <li><code>--vpu-danger-text-color</code>: Danger text color <div class="demoblock" style="background-color: var(--vpu-danger-bg-color); color: var(--vpu-danger-text-color)">X</div></li> - - <li><code>--vpu-light</code>: Light color <div class="demoblock" style="background-color: var(--vpu-light)"></div></li> - <li><code>--vpu-dark</code>: Dark color <div class="demoblock" style="background-color: var(--vpu-dark)"></div></li> - <li><code>--vpu-muted-text</code>: Muted text color <div class="demoblock" style="color: var(--vpu-muted-text)">X</div></li> - <li><code>--vpu-border-radius</code>: Border-radius <div class="demoblock" style="background-color: var(--vpu-light); border-color: var(--vpu-dark); border-style: solid; border-width: 1px; border-radius: var(--vpu-border-radius)"></div></li> - <li><code>--vpu-border-width</code>: Border-width <div class="demoblock" style="background-color: var(--vpu-light); border-color: var(--vpu-dark); border-style: solid; border-width: var(--vpu-border-width); border-radius: 0px;"></div></li> + <li><code>--dbp-primary-bg-color</code>: Primary background color <div class="demoblock" style="background-color: var(--dbp-primary-bg-color)"></div></li> + <li><code>--dbp-primary-text-color</code>: Primary text color <div class="demoblock" style="background-color: var(--dbp-primary-bg-color); color: var(--dbp-primary-text-color)">X</div></li> + <li><code>--dbp-secondary-bg-color</code>: Secondary background color <div class="demoblock" style="background-color: var(--dbp-secondary-bg-color)"></div></li> + <li><code>--dbp-secondary-text-color</code>: Secondary text color <div class="demoblock" style="background-color: var(--dbp-secondary-bg-color); color: var(--dbp-secondary-text-color)">X</div></li> + <li><code>--dbp-info-bg-color</code>: Info background color <div class="demoblock" style="background-color: var(--dbp-info-bg-color)"></div></li> + <li><code>--dbp-info-text-color</code>: Info text color <div class="demoblock" style="background-color: var(--dbp-info-bg-color); color: var(--dbp-info-text-color)">X</div></li> + <li><code>--dbp-success-bg-color</code>: Success background color <div class="demoblock" style="background-color: var(--dbp-success-bg-color)"></div></li> + <li><code>--dbp-success-text-color</code>: Success text color <div class="demoblock" style="background-color: var(--dbp-success-bg-color); color: var(--dbp-success-text-color)">X</div></li> + <li><code>--dbp-warning-bg-color</code>: Warning background color <div class="demoblock" style="background-color: var(--dbp-warning-bg-color)"></div></li> + <li><code>--dbp-warning-text-color</code>: Warning text color <div class="demoblock" style="background-color: var(--dbp-warning-bg-color); color: var(--dbp-warning-text-color)">X</div></li> + <li><code>--dbp-danger-bg-color</code>: Danger background color <div class="demoblock" style="background-color: var(--dbp-danger-bg-color)"></div></li> + <li><code>--dbp-danger-text-color</code>: Danger text color <div class="demoblock" style="background-color: var(--dbp-danger-bg-color); color: var(--dbp-danger-text-color)">X</div></li> + + <li><code>--dbp-light</code>: Light color <div class="demoblock" style="background-color: var(--dbp-light)"></div></li> + <li><code>--dbp-dark</code>: Dark color <div class="demoblock" style="background-color: var(--dbp-dark)"></div></li> + <li><code>--dbp-muted-text</code>: Muted text color <div class="demoblock" style="color: var(--dbp-muted-text)">X</div></li> + <li><code>--dbp-border-radius</code>: Border-radius <div class="demoblock" style="background-color: var(--dbp-light); border-color: var(--dbp-dark); border-style: solid; border-width: 1px; border-radius: var(--dbp-border-radius)"></div></li> + <li><code>--dbp-border-width</code>: Border-width <div class="demoblock" style="background-color: var(--dbp-light); border-color: var(--dbp-dark); border-style: solid; border-width: var(--dbp-border-width); border-radius: 0px;"></div></li> </ul> </div> </div> @@ -167,8 +167,8 @@ class VpuCommonDemo extends ScopedElementsMixin(LitElement) { <pre> <style> html { - /* This will override --vpu-primary-bg-color */ - --vpu-override-primary-bg-color: green; + /* This will override --dbp-primary-bg-color */ + --dbp-override-primary-bg-color: green; /* Same for all other variables, prefix with "override" */ } </style></pre> @@ -178,4 +178,4 @@ html { } } -commonUtils.defineCustomElement('vpu-common-demo', VpuCommonDemo); +commonUtils.defineCustomElement('dbp-common-demo', DbpCommonDemo); diff --git a/packages/common/vpu-lit-element.js b/packages/common/dbp-lit-element.js similarity index 76% rename from packages/common/vpu-lit-element.js rename to packages/common/dbp-lit-element.js index 63895435..4c336c8a 100644 --- a/packages/common/vpu-lit-element.js +++ b/packages/common/dbp-lit-element.js @@ -1,6 +1,6 @@ import {LitElement} from "lit-element"; -export default class VPULitElement extends LitElement { +export default class DBPLitElement extends LitElement { _(selector) { return this.shadowRoot === null ? this.querySelector(selector) : this.shadowRoot.querySelector(selector); } diff --git a/packages/common/demo.js b/packages/common/demo.js index 5fb4d393..72117282 100644 --- a/packages/common/demo.js +++ b/packages/common/demo.js @@ -1 +1 @@ -import './vpu-common-demo.js'; \ No newline at end of file +import './dbp-common-demo.js'; \ No newline at end of file diff --git a/packages/common/jsonld.js b/packages/common/jsonld.js index e2d00282..e45a7582 100644 --- a/packages/common/jsonld.js +++ b/packages/common/jsonld.js @@ -51,18 +51,18 @@ export default class JSONLD { initStarted[apiUrl] = true; - if (window.VPUAuthToken !== undefined) { + if (window.DBPAuthToken !== undefined) { JSONLD.doInitialization(apiUrl); } else { - // window.VPUAuthToken will be set by vpu-auth-init event - window.addEventListener("vpu-auth-init", () => JSONLD.doInitialization(apiUrl)); + // window.DBPAuthToken will be set by dbp-auth-init event + window.addEventListener("dbp-auth-init", () => JSONLD.doInitialization(apiUrl)); } } static doInitialization(apiUrl) { const xhr = new XMLHttpRequest(); xhr.open("GET", apiUrl, true); - xhr.setRequestHeader('Authorization', 'Bearer ' + window.VPUAuthToken); + xhr.setRequestHeader('Authorization', 'Bearer ' + window.DBPAuthToken); xhr.onreadystatechange = function () { if (xhr.readyState !== 4) { diff --git a/packages/common/notification.js b/packages/common/notification.js index d36aacb3..cf09ec18 100644 --- a/packages/common/notification.js +++ b/packages/common/notification.js @@ -15,7 +15,7 @@ * @param options */ function send(options) { - const event = new CustomEvent("vpu-notification-send", { + const event = new CustomEvent("dbp-notification-send", { bubbles: true, cancelable: true, detail: options, @@ -26,7 +26,7 @@ function send(options) { // true means the event was not handled if (result) { alert((options.summary !== undefined && options.summary !== "" ? options.summary + ": " : "") + options.body); - console.log("Use the web component vpu-notification to show fancy notifications."); + console.log("Use the web component dbp-notification to show fancy notifications."); } } diff --git a/packages/common/package.json b/packages/common/package.json index bd8ae7e3..7a7f33ad 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -1,5 +1,5 @@ { - "name": "vpu-common", + "name": "dbp-common", "version": "1.0.1", "module": "index.js", "license": "LGPL-2.1-or-later", diff --git a/packages/common/src/button.js b/packages/common/src/button.js index a370ddb3..26d192a9 100644 --- a/packages/common/src/button.js +++ b/packages/common/src/button.js @@ -4,7 +4,7 @@ import {MiniSpinner} from './mini-spinner.js'; import * as commonStyles from '../styles.js'; /** - * vpu-button implements a button with Bulma styles and automatic spinner and + * dbp-button implements a button with Bulma styles and automatic spinner and * disabling if button is clicked * * Use the attribute "no-spinner-on-click" to disable the spinner, then you can @@ -24,7 +24,7 @@ export class Button extends ScopedElementsMixin(LitElement) { static get scopedElements() { return { - 'vpu-mini-spinner': MiniSpinner, + 'dbp-mini-spinner': MiniSpinner, }; } @@ -75,7 +75,7 @@ export class Button extends ScopedElementsMixin(LitElement) { render() { return html` <button @click="${this.clickHandler}" class="button ${this.type}" ?disabled="${this.disabled}"> - ${this.value} <vpu-mini-spinner class="spinner" style="display: ${this.spinner ? "inline" : "none"}"></vpu-mini-spinner> + ${this.value} <dbp-mini-spinner class="spinner" style="display: ${this.spinner ? "inline" : "none"}"></dbp-mini-spinner> </button> `; } diff --git a/packages/common/src/eventbus.js b/packages/common/src/eventbus.js index 468820fe..f9cc4b12 100644 --- a/packages/common/src/eventbus.js +++ b/packages/common/src/eventbus.js @@ -13,7 +13,7 @@ export function checkIndentifier(name, allowEmpty=false) { export function createEventName(busName, eventName, operation) { checkIndentifier(busName, true); checkIndentifier(eventName); - let result = 'vpu' + ':' + busName + ':' + eventName; + let result = 'dbp' + ':' + busName + ':' + eventName; if (operation !== undefined) { checkIndentifier(operation); result += ':' + operation; diff --git a/packages/common/src/icon.js b/packages/common/src/icon.js index 35c047a6..beec4968 100644 --- a/packages/common/src/icon.js +++ b/packages/common/src/icon.js @@ -18,7 +18,7 @@ const errorIcon = ` `; export function getIconSVGURL(name) { - return commonUtils.getAssetURL('vpu-common', 'icons/' + encodeURI(name) + '.svg'); + return commonUtils.getAssetURL('dbp-common', 'icons/' + encodeURI(name) + '.svg'); } export function getIconCSS(name) { diff --git a/packages/common/styles.js b/packages/common/styles.js index d6bbe247..e064dcef 100644 --- a/packages/common/styles.js +++ b/packages/common/styles.js @@ -10,25 +10,25 @@ export function getThemeCSS() { // language=css return css` :host { - --vpu-primary-bg-color: var(--vpu-override-primary-bg-color, #007bff); - --vpu-primary-text-color: var(--vpu-override-primary-text-color, #fff); - --vpu-primary-button-border: var(--vpu-override-primary-button-border, #007bff); - --vpu-secondary-bg-color: var(--vpu-override-secondary-bg-color, #6c757d); - --vpu-secondary-text-color: var(--vpu-override-secondary-text-color, #fff); - --vpu-info-bg-color: var(--vpu-override-info-bg-color, #17a2b8); - --vpu-info-text-color: var(--vpu-override-info-text-color, #fff); - --vpu-success-bg-color: var(--vpu-override-success-bg-color, #28a745); - --vpu-success-text-color: var(--vpu-override-success-text-color, #fff); - --vpu-warning-bg-color: var(--vpu-override-warning-bg-color, #ffc107); - --vpu-warning-text-color: var(--vpu-override-warning-text-color, #343a40); - --vpu-danger-bg-color: var(--vpu-override-danger-bg-color, #dc3545); - --vpu-danger-text-color: var(--vpu-override-danger-text-color, #fff); - --vpu-light: var(--vpu-override-light, #f8f9fa); - --vpu-dark: var(--vpu-override-dark, #343a40); - --vpu-muted-text: var(--vpu-override-muted-text, #6c757d); - --vpu-border-radius: var(--vpu-override-border-radius, 0px); - --vpu-border-width: var(--vpu-override-border-width, 1px); - --vpu-placeholder-color: #777; + --dbp-primary-bg-color: var(--dbp-override-primary-bg-color, #007bff); + --dbp-primary-text-color: var(--dbp-override-primary-text-color, #fff); + --dbp-primary-button-border: var(--dbp-override-primary-button-border, #007bff); + --dbp-secondary-bg-color: var(--dbp-override-secondary-bg-color, #6c757d); + --dbp-secondary-text-color: var(--dbp-override-secondary-text-color, #fff); + --dbp-info-bg-color: var(--dbp-override-info-bg-color, #17a2b8); + --dbp-info-text-color: var(--dbp-override-info-text-color, #fff); + --dbp-success-bg-color: var(--dbp-override-success-bg-color, #28a745); + --dbp-success-text-color: var(--dbp-override-success-text-color, #fff); + --dbp-warning-bg-color: var(--dbp-override-warning-bg-color, #ffc107); + --dbp-warning-text-color: var(--dbp-override-warning-text-color, #343a40); + --dbp-danger-bg-color: var(--dbp-override-danger-bg-color, #dc3545); + --dbp-danger-text-color: var(--dbp-override-danger-text-color, #fff); + --dbp-light: var(--dbp-override-light, #f8f9fa); + --dbp-dark: var(--dbp-override-dark, #343a40); + --dbp-muted-text: var(--dbp-override-muted-text, #6c757d); + --dbp-border-radius: var(--dbp-override-border-radius, 0px); + --dbp-border-width: var(--dbp-override-border-width, 1px); + --dbp-placeholder-color: #777; } `; } @@ -49,8 +49,8 @@ export function getGeneralCSS(doMarginPaddingReset = true) { } code { - background-color: var(--vpu-light); - color: var(--vpu-danger-bg-color); + background-color: var(--dbp-light); + color: var(--dbp-danger-bg-color); font-size: 1em; line-height: 1.5em; font-weight: normal; @@ -68,7 +68,7 @@ export function getGeneralCSS(doMarginPaddingReset = true) { .input, .textarea, .select select { border: solid 1px #aaa; - border-radius: var(--vpu-border-radius); + border-radius: var(--dbp-border-radius); padding-bottom: calc(.375em - 1px); padding-left: calc(.625em - 1px); padding-right: calc(.625em - 1px); @@ -76,7 +76,7 @@ export function getGeneralCSS(doMarginPaddingReset = true) { } .input::placeholder, .textarea::placeholder, .select select::placeholder { - color: var(--vpu-placeholder-color); + color: var(--dbp-placeholder-color); } input, ::placeholder, textarea, select, .select select { @@ -101,7 +101,7 @@ export function getGeneralCSS(doMarginPaddingReset = true) { .hidden { display: none; } a { - color: var(--vpu-override-muted-text); + color: var(--dbp-override-muted-text); cursor: pointer; text-decoration: none; } @@ -149,9 +149,9 @@ export function getGeneralCSS(doMarginPaddingReset = true) { .input, .select select, .textarea { background-color: #fff; - border-color: var(--vpu-muted); - border-radius: var(--vpu-border-radius); - color: var(--vpu-muted); + border-color: var(--dbp-muted); + border-radius: var(--dbp-border-radius); + color: var(--dbp-muted); } *, ::after, ::before { @@ -165,7 +165,7 @@ export function getGeneralCSS(doMarginPaddingReset = true) { background-size: 25%; border-color: black; border-width: 1px; - border-radius: var(--vpu-border-radius); + border-radius: var(--dbp-border-radius); color: black; padding: 0.14rem 1.0rem 0.14rem 0.14rem; border-style: solid; @@ -326,10 +326,10 @@ export function getNotificationCSS() { // language=css return css` .notification { - background-color: var(--vpu-light); + background-color: var(--dbp-light); padding: 1.25rem 2.5rem 1.25rem 1.5rem; position: relative; - border-radius: var(--vpu-border-radius); + border-radius: var(--dbp-border-radius); } .notification a:not(.button):not(.dropdown-item) { @@ -343,15 +343,15 @@ export function getNotificationCSS() { .notification code, .notification pre { - color: var(--vpu-light); - background: var(--vpu-muted-text); + color: var(--dbp-light); + background: var(--dbp-muted-text); } .notification pre code { background: transparent; } - .notification vpu-icon { + .notification dbp-icon { font-size: 1.4em; margin-right: 0.4em; } @@ -369,28 +369,28 @@ export function getNotificationCSS() { } .notification.is-primary { - background-color: var(--vpu-primary-bg-color); - color: var(--vpu-primary-text-color); + background-color: var(--dbp-primary-bg-color); + color: var(--dbp-primary-text-color); } .notification.is-info { - background-color: var(--vpu-info-bg-color); - color: var(--vpu-info-text-color); + background-color: var(--dbp-info-bg-color); + color: var(--dbp-info-text-color); } .notification.is-success { - background-color: var(--vpu-success-bg-color); - color: var(--vpu-success-text-color); + background-color: var(--dbp-success-bg-color); + color: var(--dbp-success-text-color); } .notification.is-warning { - background-color: var(--vpu-warning-bg-color); - color: var(--vpu-warning-text-color); + background-color: var(--dbp-warning-bg-color); + color: var(--dbp-warning-text-color); } .notification.is-danger { - background-color: var(--vpu-danger-bg-color); - color: var(--vpu-danger-text-color); + background-color: var(--dbp-danger-bg-color); + color: var(--dbp-danger-text-color); } `; } @@ -402,7 +402,7 @@ export function getButtonCSS() { border-style: solid; border-color: black; border-width: 1px; - border-radius: var(--vpu-border-radius); + border-radius: var(--dbp-border-radius); color: black; cursor: pointer; justify-content: center; @@ -425,34 +425,34 @@ export function getButtonCSS() { } button.button.is-small, .button.is-small { - border-radius: calc(var(--vpu-border-radius) / 2); + border-radius: calc(var(--dbp-border-radius) / 2); font-size: .75rem; } button.button.is-primary, .button.is-primary { - background-color: var(--vpu-primary-bg-color); - border: var(--vpu-primary-button-border); - color: var(--vpu-primary-text-color); + background-color: var(--dbp-primary-bg-color); + border: var(--dbp-primary-button-border); + color: var(--dbp-primary-text-color); } button.button.is-info, .button.is-info { - background-color: var(--vpu-info-bg-color); - color: var(--vpu-info-text-color); + background-color: var(--dbp-info-bg-color); + color: var(--dbp-info-text-color); } button.button.is-success, .button.is-success { - background-color: var(--vpu-success-bg-color); - color: var(--vpu-success-text-color); + background-color: var(--dbp-success-bg-color); + color: var(--dbp-success-text-color); } button.button.is-warning, .button.is-warning { - background-color: var(--vpu-warning-bg-color); - color: var(--vpu-warning-text-color); + background-color: var(--dbp-warning-bg-color); + color: var(--dbp-warning-text-color); } .button.button.is-danger, .button.is-danger { - background-color: var(--vpu-danger-bg-color); - color: var(--vpu-danger-text-color); + background-color: var(--dbp-danger-bg-color); + color: var(--dbp-danger-text-color); } button.button[disabled], .button[disabled], fieldset[disabled] .button { @@ -535,7 +535,7 @@ export function getTagCSS() { .tag:not(body) { align-items: center; background-color: whitesmoke; - border-radius: var(--vpu-border-radius); + border-radius: var(--dbp-border-radius); color: #4a4a4a; display: inline-flex; font-size: 0.75rem; @@ -553,12 +553,12 @@ export function getTagCSS() { } .tag:not(body).is-dark { - background-color: var(--vpu-dark); + background-color: var(--dbp-dark); color: whitesmoke; } .tag:not(body).is-light { - background-color: var(--vpu-light); + background-color: var(--dbp-light); color: #363636; } @@ -649,7 +649,7 @@ export function getDocumentationCSS() { } .documentation a { - border-bottom: 1px solid var(--vpu-muted-text); + border-bottom: 1px solid var(--dbp-muted-text); transition: background-color 0.15s, color 0.15s; } @@ -673,11 +673,11 @@ export function getSelect2CSS() { // language=css return css` .select2-dropdown { - border-radius: var(--vpu-border-radius); + border-radius: var(--dbp-border-radius); } .select2-container--default .select2-selection--single { - border-radius: var(--vpu-border-radius); + border-radius: var(--dbp-border-radius); } .select2-container--default .select2-selection--single .select2-selection__rendered { @@ -691,7 +691,7 @@ export function getSelect2CSS() { } .select2-container--default .select2-selection--single .select2-selection__placeholder { - color: var(--vpu-placeholder-color); + color: var(--dbp-placeholder-color); } /* Work around single selections not wrapping and breaking responsivness */ diff --git a/packages/common/test/eventbus.js b/packages/common/test/eventbus.js index 209ff165..1f80e773 100644 --- a/packages/common/test/eventbus.js +++ b/packages/common/test/eventbus.js @@ -3,9 +3,9 @@ import {EventBus, createEventName, checkIndentifier} from '../src/eventbus.js'; suite('helpers', () => { test('createEventName', () => { - assert.equal(createEventName('foo', 'bar'), 'vpu:foo:bar'); - assert.equal(createEventName('', 'bar'), 'vpu::bar'); - assert.equal(createEventName('foo', 'bar', 'baz'), 'vpu:foo:bar:baz'); + assert.equal(createEventName('foo', 'bar'), 'dbp:foo:bar'); + assert.equal(createEventName('', 'bar'), 'dbp::bar'); + assert.equal(createEventName('foo', 'bar', 'baz'), 'dbp:foo:bar:baz'); }); test('checkIndentifier', () => { diff --git a/packages/data-table-view/.gitlab-ci.yml b/packages/data-table-view/.gitlab-ci.yml index 41502e66..352b5f42 100644 --- a/packages/data-table-view/.gitlab-ci.yml +++ b/packages/data-table-view/.gitlab-ci.yml @@ -1,7 +1,7 @@ -image: registry.gitlab.tugraz.at/vpu/webcomponents/common/main:v1 +image: registry.gitlab.tugraz.at/dbp/webcomponents/common/main:v1 before_script: - - "sed -i 's|git@gitlab.tugraz.at:VPU|../..|g' .gitmodules" + - "sed -i 's|git@gitlab.tugraz.at:dbp|../..|g' .gitmodules" - git submodule sync - git submodule update --init diff --git a/packages/data-table-view/.gitmodules b/packages/data-table-view/.gitmodules index 1b2847ad..d2ec594f 100644 --- a/packages/data-table-view/.gitmodules +++ b/packages/data-table-view/.gitmodules @@ -1,6 +1,6 @@ [submodule "vendor/common"] path = vendor/common - url = git@gitlab.tugraz.at:VPU/WebComponents/Common.git + url = git@gitlab.tugraz.at:dbp/web-components/Common.git [submodule "vendor/auth"] path = vendor/auth - url = git@gitlab.tugraz.at:VPU/WebComponents/Auth.git + url = git@gitlab.tugraz.at:dbp/web-components/Auth.git diff --git a/packages/data-table-view/README.md b/packages/data-table-view/README.md index 9185e4c9..ae4670a1 100644 --- a/packages/data-table-view/README.md +++ b/packages/data-table-view/README.md @@ -1,34 +1,34 @@ # DataTableView Web Component -[GitLab Repository](https://gitlab.tugraz.at/VPU/WebComponents/KnowledgeBaseWebPageElementView) +[GitLab Repository](https://gitlab.tugraz.at/dbp/web-components/KnowledgeBaseWebPageElementView) # Usage ```html -<vpu-data-table-view></vpu-data-table-view> +<dbp-data-table-view></dbp-data-table-view> ``` # Attributes - `lang` (optional, default: `de`): set to `de` or `en` for German or English - - example `<vpu-data-table-view lang="de"></vpu-data-table-view>` + - example `<dbp-data-table-view lang="de"></dbp-data-table-view>` - `paging` (optional, required to let datatable do the paging of loaded rows) - - example `<vpu-data-table-view paging></vpu-data-table-view>` + - example `<dbp-data-table-view paging></dbp-data-table-view>` - `searching` (optional, required if a search box is desired) - - example `<vpu-data-table-view searching></vpu-data-table-view>` + - example `<dbp-data-table-view searching></dbp-data-table-view>` - `exportable` (optional): set to display export buttons - - example `<vpu-data-table-view exportable></pu-data-table-view>` + - example `<dbp-data-table-view exportable></pu-data-table-view>` - `export-name` (optional, default: 'Data Export'): add name for download file (without extension) - - example `<vpu-data-table-view exportable export-name="All Items"></pu-data-table-view>` + - example `<dbp-data-table-view exportable export-name="All Items"></pu-data-table-view>` - `column-searching` (optional, default: false): add search fields for every column - - example `<vpu-data-table-view column-searching></pu-data-table-view>` + - example `<dbp-data-table-view column-searching></pu-data-table-view>` - `default-order` (optional, default: [ ]): set the default order as column and direction - - example `<vpu-data-table-view default-order='[1,"asc"]'></pu-data-table-view>` - - example `<vpu-data-table-view default-order='[[0,"desc"],[2,"asc"]]'></pu-data-table-view>` + - example `<dbp-data-table-view default-order='[1,"asc"]'></pu-data-table-view>` + - example `<dbp-data-table-view default-order='[[0,"desc"],[2,"asc"]]'></pu-data-table-view>` # Local development ```bash # get the source -git clone git@gitlab.tugraz.at:VPU/WebComponents/DataTableView.git +git clone git@gitlab.tugraz.at:dbp/web-components/DataTableView.git cd DataTableView git submodule update --init diff --git a/packages/data-table-view/assets/index.html b/packages/data-table-view/assets/index.html index edb12fa5..094eee25 100644 --- a/packages/data-table-view/assets/index.html +++ b/packages/data-table-view/assets/index.html @@ -3,7 +3,7 @@ <head> <meta charset="UTF-8"> <meta name="viewport" content="width=device-width, initial-scale=1"> - <script type="module" id="vpu-data-table-view-src" src="vpu-data-table-view-demo.js"></script> + <script type="module" id="dbp-data-table-view-src" src="dbp-data-table-view-demo.js"></script> <style> body { @@ -15,6 +15,6 @@ <body> -<vpu-data-table-view-demo lang="de"></vpu-data-table-view-demo> +<dbp-data-table-view-demo lang="de"></dbp-data-table-view-demo> </body> </html> diff --git a/packages/data-table-view/package.json b/packages/data-table-view/package.json index 7df2526d..329a736b 100644 --- a/packages/data-table-view/package.json +++ b/packages/data-table-view/package.json @@ -1,5 +1,5 @@ { - "name": "vpu-data-table-view", + "name": "dbp-data-table-view", "version": "1.0.0", "main": "src/index.js", "license": "LGPL-2.1-or-later", @@ -24,8 +24,8 @@ "rollup-plugin-serve": "^1.0.1", "rollup-plugin-terser": "^6.1.0", "@rollup/plugin-url": "^5.0.1", - "vpu-auth": "^1.0.0", - "vpu-common": "^1.0.0" + "dbp-auth": "^1.0.0", + "dbp-common": "^1.0.0" }, "dependencies": { "@open-wc/scoped-elements": "^1.1.1", diff --git a/packages/data-table-view/rollup.config.js b/packages/data-table-view/rollup.config.js index 0d379af5..eb2ff3e0 100644 --- a/packages/data-table-view/rollup.config.js +++ b/packages/data-table-view/rollup.config.js @@ -14,7 +14,7 @@ const build = (typeof process.env.BUILD !== 'undefined') ? process.env.BUILD : ' console.log("build: " + build); export default { - input: (build != 'test') ? ['src/vpu-data-table-view.js', 'src/vpu-data-table-view-demo.js'] : glob.sync('test/**/*.js'), + input: (build != 'test') ? ['src/dbp-data-table-view.js', 'src/dbp-data-table-view-demo.js'] : glob.sync('test/**/*.js'), output: { dir: 'dist', entryFileNames: '[name].js', @@ -61,14 +61,14 @@ export default { {src: 'assets/index.html', dest: 'dist'}, //rename: pkg.name + '.html'}, {src: 'assets/*.css', dest: 'dist/local/' + pkg.name}, {src: 'assets/*.ico', dest: 'dist/local/' + pkg.name}, - {src: 'node_modules/vpu-common/vpu-spinner.js', dest: 'dist/local/' + pkg.name, rename: 'spinner.js'}, - {src: 'node_modules/vpu-common/assets/icons/*.svg', dest: 'dist/local/vpu-common/icons'}, + {src: 'node_modules/dbp-common/dbp-spinner.js', dest: 'dist/local/' + pkg.name, rename: 'spinner.js'}, + {src: 'node_modules/dbp-common/assets/icons/*.svg', dest: 'dist/local/dbp-common/icons'}, {src: 'assets/nomodule.js', dest: 'dist/local/' + pkg.name}, - {src: '../../node_modules/datatables.net-dt/css', dest: 'dist/local/vpu-data-table-view'}, - {src: '../../node_modules/datatables.net-dt/images', dest: 'dist/local/vpu-data-table-view'}, - {src: '../../node_modules/datatables.net-responsive-dt/css', dest: 'dist/local/vpu-data-table-view'}, - {src: '../../node_modules/datatables.net-buttons-dt/css', dest: 'dist/local/vpu-data-table-view'}, + {src: '../../node_modules/datatables.net-dt/css', dest: 'dist/local/dbp-data-table-view'}, + {src: '../../node_modules/datatables.net-dt/images', dest: 'dist/local/dbp-data-table-view'}, + {src: '../../node_modules/datatables.net-responsive-dt/css', dest: 'dist/local/dbp-data-table-view'}, + {src: '../../node_modules/datatables.net-buttons-dt/css', dest: 'dist/local/dbp-data-table-view'}, ], }), diff --git a/packages/data-table-view/src/data-table-view.js b/packages/data-table-view/src/data-table-view.js index 8a226071..7c938637 100644 --- a/packages/data-table-view/src/data-table-view.js +++ b/packages/data-table-view/src/data-table-view.js @@ -11,9 +11,9 @@ import {i18n} from './i18n'; import {css, html, LitElement, unsafeCSS} from 'lit-element'; import de from '../assets/datatables/i18n/German'; import en from '../assets/datatables/i18n/English'; -import {getIconSVGURL} from 'vpu-common'; -import * as commonUtils from 'vpu-common/utils'; -import * as commonStyles from 'vpu-common/styles'; +import {getIconSVGURL} from 'dbp-common'; +import * as commonUtils from 'dbp-common/utils'; +import * as commonStyles from 'dbp-common/styles'; dt(window, $); resp(window, $); @@ -170,7 +170,7 @@ export class DataTableView extends LitElement { ] }); - const dataTableLength = sessionStorage.getItem('vpu-data-table-length'); + const dataTableLength = sessionStorage.getItem('dbp-data-table-length'); //Retrieve page length from session storage if (dataTableLength !== null) { @@ -179,7 +179,7 @@ export class DataTableView extends LitElement { //Save page length in session storage this.table.on('length.dt', function ( e, settings, len ) { - sessionStorage.setItem('vpu-data-table-length', len); + sessionStorage.setItem('dbp-data-table-length', len); }); this.data = data; @@ -246,8 +246,8 @@ export class DataTableView extends LitElement { text-align: center; text-indent: 0 !important; line-height: 0.9em; - color: var(--vpu-primary-text-color); - background-color: var(--vpu-primary-bg-color); + color: var(--dbp-primary-text-color); + background-color: var(--dbp-primary-bg-color); content: '+'; } @@ -282,8 +282,8 @@ export class DataTableView extends LitElement { ${orderExpandIconOverrides} .dataTables_wrapper .dataTables_paginate .paginate_button.current, .dataTables_wrapper .dataTables_paginate .paginate_button.current:hover { - color: var(--vpu-muted-text); - border-radius: var(--vpu-border-radius); + color: var(--dbp-muted-text); + border-radius: var(--dbp-border-radius); background: transparent; } @@ -292,7 +292,7 @@ export class DataTableView extends LitElement { } select { - border-radius: calc(var(--vpu-border-radius)/2); + border-radius: calc(var(--dbp-border-radius)/2); height: 28px; margin-left: 3px; } @@ -304,7 +304,7 @@ export class DataTableView extends LitElement { .dataTables_filter input { border-radius: 0; border-style: solid; - border-color: var(--vpu-dark); + border-color: var(--dbp-dark); border-width: 1px; padding: 0.1em; } @@ -316,9 +316,9 @@ export class DataTableView extends LitElement { } render() { - let dt_css = commonUtils.getAssetURL('vpu-data-table-view', 'css/jquery.dataTables.min.css'); - let rs_css = commonUtils.getAssetURL('vpu-data-table-view', 'css/responsive.dataTables.min.css'); - let bt_css = commonUtils.getAssetURL('vpu-data-table-view', 'css/buttons.dataTables.min.css'); + let dt_css = commonUtils.getAssetURL('dbp-data-table-view', 'css/jquery.dataTables.min.css'); + let rs_css = commonUtils.getAssetURL('dbp-data-table-view', 'css/responsive.dataTables.min.css'); + let bt_css = commonUtils.getAssetURL('dbp-data-table-view', 'css/buttons.dataTables.min.css'); return html` <link rel="stylesheet" href="${dt_css}"> diff --git a/packages/data-table-view/src/vpu-data-table-view-demo.js b/packages/data-table-view/src/dbp-data-table-view-demo.js similarity index 90% rename from packages/data-table-view/src/vpu-data-table-view-demo.js rename to packages/data-table-view/src/dbp-data-table-view-demo.js index 6ad31f9d..aa0974c5 100644 --- a/packages/data-table-view/src/vpu-data-table-view-demo.js +++ b/packages/data-table-view/src/dbp-data-table-view-demo.js @@ -1,10 +1,10 @@ -import {AuthKeycloak, LoginButton} from 'vpu-auth'; +import {AuthKeycloak, LoginButton} from 'dbp-auth'; import {DataTableView} from './data-table-view.js'; import {i18n} from './i18n'; import {css, html, LitElement} from 'lit-element'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; -import * as commonUtils from 'vpu-common/utils'; -import * as commonStyles from 'vpu-common/styles'; +import * as commonUtils from 'dbp-common/utils'; +import * as commonStyles from 'dbp-common/styles'; class DataTableViewDemo extends ScopedElementsMixin(LitElement) { constructor() { @@ -15,9 +15,9 @@ class DataTableViewDemo extends ScopedElementsMixin(LitElement) { static get scopedElements() { return { - 'vpu-data-table-view': DataTableView, - 'vpu-auth-keycloak': AuthKeycloak, - 'vpu-login-button': LoginButton, + 'dbp-data-table-view': DataTableView, + 'dbp-auth-keycloak': AuthKeycloak, + 'dbp-login-button': LoginButton, }; } @@ -137,8 +137,8 @@ class DataTableViewDemo extends ScopedElementsMixin(LitElement) { getAuthComponentHtml() { return this.noAuth ? html`` : html` <div class="content"> - <vpu-auth-keycloak lang="${this.lang}" url="https://auth-dev.tugraz.at/auth" realm="tugraz" client-id="auth-dev-mw-frontend-local" load-person try-login></vpu-auth-keycloak> - <vpu-login-button lang="${this.lang}" show-image></vpu-login-button> + <dbp-auth-keycloak lang="${this.lang}" url="https://auth-dev.tugraz.at/auth" realm="tugraz" client-id="auth-dev-mw-frontend-local" load-person try-login></dbp-auth-keycloak> + <dbp-login-button lang="${this.lang}" show-image></dbp-login-button> </div> `; } @@ -203,20 +203,20 @@ class DataTableViewDemo extends ScopedElementsMixin(LitElement) { <div class="box"> <label for="id-sum">Sum of column <b>Number</b> is</label> <input type="text" readonly value="" name="sum" id="id-sum"> - <vpu-data-table-view paging searching column-searching + <dbp-data-table-view paging searching column-searching default-order='[1,"asc"]' exportable export-name="Demo Export" - lang="${this.lang}" id="vdtv1"></vpu-data-table-view> + lang="${this.lang}" id="vdtv1"></dbp-data-table-view> </div> <h4>DataTable: no data, no paging, no searching</h4> <div class="box"> <button class="button is-small" @click="${this.vdtv2_add_rows}">add something...</button> - <vpu-data-table-view lang="${this.lang}" id="vdtv2"></vpu-data-table-view> + <dbp-data-table-view lang="${this.lang}" id="vdtv2"></dbp-data-table-view> </div> <h4>DataTable: ordering by column 'zip' desc, 'museum' asc</h4> <div class="box"> - <vpu-data-table-view default-order='[[1,"desc"],[2,"asc"]]' - lang="${this.lang}" id="vdtv3"></vpu-data-table-view> + <dbp-data-table-view default-order='[[1,"desc"],[2,"asc"]]' + lang="${this.lang}" id="vdtv3"></dbp-data-table-view> </div> </div> @@ -225,4 +225,4 @@ class DataTableViewDemo extends ScopedElementsMixin(LitElement) { } } -commonUtils.defineCustomElement('vpu-data-table-view-demo', DataTableViewDemo); +commonUtils.defineCustomElement('dbp-data-table-view-demo', DataTableViewDemo); diff --git a/packages/data-table-view/src/dbp-data-table-view.js b/packages/data-table-view/src/dbp-data-table-view.js new file mode 100644 index 00000000..76ad4af5 --- /dev/null +++ b/packages/data-table-view/src/dbp-data-table-view.js @@ -0,0 +1,4 @@ +import * as commonUtils from 'dbp-common/utils'; +import {DataTableView} from './data-table-view.js'; + +commonUtils.defineCustomElement('dbp-data-table-view', DataTableView); diff --git a/packages/data-table-view/src/demo.js b/packages/data-table-view/src/demo.js index b4009309..84cdedf3 100644 --- a/packages/data-table-view/src/demo.js +++ b/packages/data-table-view/src/demo.js @@ -1 +1 @@ -import './vpu-data-table-view-demo.js'; \ No newline at end of file +import './dbp-data-table-view-demo.js'; \ No newline at end of file diff --git a/packages/data-table-view/src/vpu-data-table-view.js b/packages/data-table-view/src/vpu-data-table-view.js deleted file mode 100644 index bb9e5eaa..00000000 --- a/packages/data-table-view/src/vpu-data-table-view.js +++ /dev/null @@ -1,4 +0,0 @@ -import * as commonUtils from 'vpu-common/utils'; -import {DataTableView} from './data-table-view.js'; - -commonUtils.defineCustomElement('vpu-data-table-view', DataTableView); diff --git a/packages/data-table-view/test/unit.js b/packages/data-table-view/test/unit.js index 1ff2e129..531a2bfe 100644 --- a/packages/data-table-view/test/unit.js +++ b/packages/data-table-view/test/unit.js @@ -1,13 +1,13 @@ import {assert} from 'chai'; -import '../src/vpu-data-table-view'; -import '../src/vpu-data-table-view-demo'; +import '../src/dbp-data-table-view'; +import '../src/dbp-data-table-view-demo'; -suite('vpu-data-table-view basics', () => { +suite('dbp-data-table-view basics', () => { let node; suiteSetup(async () => { - node = document.createElement('vpu-data-table-view'); + node = document.createElement('dbp-data-table-view'); document.body.appendChild(node); await node.updateComplete; }); @@ -21,11 +21,11 @@ suite('vpu-data-table-view basics', () => { }); }); -suite('vpu-data-table-view-demo basics', () => { +suite('dbp-data-table-view-demo basics', () => { let node; suiteSetup(async () => { - node = document.createElement('vpu-data-table-view-demo'); + node = document.createElement('dbp-data-table-view-demo'); document.body.appendChild(node); await node.updateComplete; }); diff --git a/packages/knowledge-base-web-page-element-view/.gitlab-ci.yml b/packages/knowledge-base-web-page-element-view/.gitlab-ci.yml index 9cadb871..190b3a0c 100644 --- a/packages/knowledge-base-web-page-element-view/.gitlab-ci.yml +++ b/packages/knowledge-base-web-page-element-view/.gitlab-ci.yml @@ -3,7 +3,7 @@ image: debian:buster before_script: - apt update - apt install -y git - - "sed -i 's|git@gitlab.tugraz.at:VPU|../..|g' .gitmodules" + - "sed -i 's|git@gitlab.tugraz.at:dbp|../..|g' .gitmodules" - git submodule sync - git submodule update --init diff --git a/packages/knowledge-base-web-page-element-view/.gitmodules b/packages/knowledge-base-web-page-element-view/.gitmodules index 1b2847ad..d2ec594f 100644 --- a/packages/knowledge-base-web-page-element-view/.gitmodules +++ b/packages/knowledge-base-web-page-element-view/.gitmodules @@ -1,6 +1,6 @@ [submodule "vendor/common"] path = vendor/common - url = git@gitlab.tugraz.at:VPU/WebComponents/Common.git + url = git@gitlab.tugraz.at:dbp/web-components/Common.git [submodule "vendor/auth"] path = vendor/auth - url = git@gitlab.tugraz.at:VPU/WebComponents/Auth.git + url = git@gitlab.tugraz.at:dbp/web-components/Auth.git diff --git a/packages/knowledge-base-web-page-element-view/README.md b/packages/knowledge-base-web-page-element-view/README.md index d84fa05d..79f0e5e7 100644 --- a/packages/knowledge-base-web-page-element-view/README.md +++ b/packages/knowledge-base-web-page-element-view/README.md @@ -1,29 +1,29 @@ # KnowledgeBaseWebPageElementView Web Component -[GitLab Repository](https://gitlab.tugraz.at/VPU/WebComponents/KnowledgeBaseWebPageElementView) +[GitLab Repository](https://gitlab.tugraz.at/dbp/web-components/KnowledgeBaseWebPageElementView) ## Usage ```html -<vpu-knowledge-base-web-page-element-view></vpu-knowledge-base-web-page-element-view> +<dbp-knowledge-base-web-page-element-view></dbp-knowledge-base-web-page-element-view> ``` ## Attributes - `value`: path to the web page element - - example `<vpu-knowledge-base-web-page-element-view value="path/to/my/article"></vpu-knowledge-base-web-page-element-view>` + - example `<dbp-knowledge-base-web-page-element-view value="path/to/my/article"></dbp-knowledge-base-web-page-element-view>` - `lang` (optional, default: `de`): set to `de` or `en` for German or English - - example `<vpu-knowledge-base-web-page-element-view lang="de"></vpu-knowledge-base-web-page-element-view>` + - example `<dbp-knowledge-base-web-page-element-view lang="de"></dbp-knowledge-base-web-page-element-view>` - `entry-point-url` (optional, default is the TU Graz entry point url): entry point url to access the api - - example `<vpu-knowledge-base-web-page-element-view entry-point-url="http://127.0.0.1:8000"></vpu-knowledge-base-web-page-element-view>` + - example `<dbp-knowledge-base-web-page-element-view entry-point-url="http://127.0.0.1:8000"></dbp-knowledge-base-web-page-element-view>` - `text` (optional): text to click to show the information loaded from the webpage - - example `<vpu-knowledge-base-web-page-element-view text="Click me to show more information"></vpu-knowledge-base-web-page-element-view>` + - example `<dbp-knowledge-base-web-page-element-view text="Click me to show more information"></dbp-knowledge-base-web-page-element-view>` ## Local development ```bash # get the source -git clone git@gitlab.tugraz.at:VPU/WebComponents/KnowledgeBaseWebPageElementView.git +git clone git@gitlab.tugraz.at:dbp/web-components/KnowledgeBaseWebPageElementView.git cd KnowledgeBaseWebPageElementView git submodule update --init diff --git a/packages/knowledge-base-web-page-element-view/assets/index.html b/packages/knowledge-base-web-page-element-view/assets/index.html index 866c51b3..aead19c9 100644 --- a/packages/knowledge-base-web-page-element-view/assets/index.html +++ b/packages/knowledge-base-web-page-element-view/assets/index.html @@ -2,10 +2,10 @@ <html> <head> <meta charset="UTF-8"> - <script type="module" id="vpu-knowledge-base-web-page-element-view-src" src="vpu-knowledge-base-web-page-element-view-demo.js"></script> + <script type="module" id="dbp-knowledge-base-web-page-element-view-src" src="dbp-knowledge-base-web-page-element-view-demo.js"></script> </head> <style> - vpu-knowledge-base-web-page-element-view-demo { + dbp-knowledge-base-web-page-element-view-demo { --KBBorderRadius: 10px; --KBBorder: 2px dashed red; --KBMargin: 20px; @@ -14,7 +14,7 @@ </style> <body> -<vpu-knowledge-base-web-page-element-view-demo lang="de"></vpu-knowledge-base-web-page-element-view-demo> +<dbp-knowledge-base-web-page-element-view-demo lang="de"></dbp-knowledge-base-web-page-element-view-demo> </body> </html> diff --git a/packages/knowledge-base-web-page-element-view/package.json b/packages/knowledge-base-web-page-element-view/package.json index c57c67b0..8fe1d42e 100644 --- a/packages/knowledge-base-web-page-element-view/package.json +++ b/packages/knowledge-base-web-page-element-view/package.json @@ -1,5 +1,5 @@ { - "name": "vpu-knowledge-base-web-page-element-view", + "name": "dbp-knowledge-base-web-page-element-view", "version": "1.0.0", "main": "src/index.js", "license": "LGPL-2.1-or-later", @@ -25,8 +25,8 @@ "rollup-plugin-serve": "^1.0.1", "rollup-plugin-terser": "^6.1.0", "@rollup/plugin-url": "^5.0.1", - "vpu-auth": "^1.0.0", - "vpu-common": "^1.0.0" + "dbp-auth": "^1.0.0", + "dbp-common": "^1.0.0" }, "dependencies": { "@open-wc/scoped-elements": "^1.1.1", diff --git a/packages/knowledge-base-web-page-element-view/rollup.config.js b/packages/knowledge-base-web-page-element-view/rollup.config.js index ba858b00..331a360a 100644 --- a/packages/knowledge-base-web-page-element-view/rollup.config.js +++ b/packages/knowledge-base-web-page-element-view/rollup.config.js @@ -13,7 +13,7 @@ const build = (typeof process.env.BUILD !== 'undefined') ? process.env.BUILD : ' console.log("build: " + build); export default { - input: (build != 'test') ? ['src/vpu-knowledge-base-web-page-element-view.js', 'src/vpu-knowledge-base-web-page-element-view-demo.js'] : glob.sync('test/**/*.js'), + input: (build != 'test') ? ['src/dbp-knowledge-base-web-page-element-view.js', 'src/dbp-knowledge-base-web-page-element-view-demo.js'] : glob.sync('test/**/*.js'), output: { dir: 'dist', entryFileNames: '[name].js', @@ -48,7 +48,7 @@ export default { targets: [ {src: 'assets/index.html', dest: 'dist'}, {src: 'assets/favicon.ico', dest: 'dist'}, - {src: 'node_modules/vpu-common/assets/icons/*.svg', dest: 'dist/local/vpu-common/icons'}, + {src: 'node_modules/dbp-common/assets/icons/*.svg', dest: 'dist/local/dbp-common/icons'}, ], }), (process.env.ROLLUP_WATCH === 'true') ? serve({contentBase: 'dist', host: '127.0.0.1', port: 8002}) : false diff --git a/packages/knowledge-base-web-page-element-view/src/vpu-knowledge-base-web-page-element-view-demo.js b/packages/knowledge-base-web-page-element-view/src/dbp-knowledge-base-web-page-element-view-demo.js similarity index 72% rename from packages/knowledge-base-web-page-element-view/src/vpu-knowledge-base-web-page-element-view-demo.js rename to packages/knowledge-base-web-page-element-view/src/dbp-knowledge-base-web-page-element-view-demo.js index 1676d3be..21e0674d 100644 --- a/packages/knowledge-base-web-page-element-view/src/vpu-knowledge-base-web-page-element-view-demo.js +++ b/packages/knowledge-base-web-page-element-view/src/dbp-knowledge-base-web-page-element-view-demo.js @@ -1,10 +1,10 @@ import {i18n} from './i18n'; import {css, html, LitElement} from 'lit-element'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; -import {AuthKeycloak, LoginButton} from 'vpu-auth'; +import {AuthKeycloak, LoginButton} from 'dbp-auth'; import {KnowledgeBaseWebPageElementView} from './knowledge-base-web-page-element-view.js'; -import * as commonUtils from 'vpu-common/utils'; -import * as commonStyles from 'vpu-common/styles'; +import * as commonUtils from 'dbp-common/utils'; +import * as commonStyles from 'dbp-common/styles'; class KnowledgeBaseWebPageElementViewDemo extends ScopedElementsMixin(LitElement) { constructor() { @@ -15,9 +15,9 @@ class KnowledgeBaseWebPageElementViewDemo extends ScopedElementsMixin(LitElement static get scopedElements() { return { - 'vpu-knowledge-base-web-page-element-view' : KnowledgeBaseWebPageElementView, - 'vpu-auth-keycloak': AuthKeycloak, - 'vpu-login-button': LoginButton, + 'dbp-knowledge-base-web-page-element-view' : KnowledgeBaseWebPageElementView, + 'dbp-auth-keycloak': AuthKeycloak, + 'dbp-login-button': LoginButton, }; } @@ -65,8 +65,8 @@ class KnowledgeBaseWebPageElementViewDemo extends ScopedElementsMixin(LitElement getAuthComponentHtml() { return this.noAuth ? html`` : html` <div class="content"> - <vpu-auth-keycloak lang="${this.lang}" url="https://auth-dev.tugraz.at/auth" realm="tugraz" client-id="auth-dev-mw-frontend-local" load-person try-login></vpu-auth-keycloak> - <vpu-login-button lang="${this.lang}" show-image></vpu-login-button> + <dbp-auth-keycloak lang="${this.lang}" url="https://auth-dev.tugraz.at/auth" realm="tugraz" client-id="auth-dev-mw-frontend-local" load-person try-login></dbp-auth-keycloak> + <dbp-login-button lang="${this.lang}" show-image></dbp-login-button> </div> `; } @@ -81,27 +81,27 @@ class KnowledgeBaseWebPageElementViewDemo extends ScopedElementsMixin(LitElement <div class="container"> <h2 class="subtitle">Deutsch</h2> <p>Ein erster Schritt</p> - <vpu-knowledge-base-web-page-element-view lang="de" entry-point-url="${commonUtils.getAPiUrl()}" value="bedienstete/bibliothek/buch-ausleihen" text="Ein Buch ausleihen"></vpu-knowledge-base-web-page-element-view> + <dbp-knowledge-base-web-page-element-view lang="de" entry-point-url="${commonUtils.getAPiUrl()}" value="bedienstete/bibliothek/buch-ausleihen" text="Ein Buch ausleihen"></dbp-knowledge-base-web-page-element-view> </div> <div class="container"> <h2 class="subtitle">Englisch</h2> <p>A first step</p> - <vpu-knowledge-base-web-page-element-view lang="en" entry-point-url="${commonUtils.getAPiUrl()}" value="bedienstete/bibliothek/buch-ausleihen" text="Borrow a book"></vpu-knowledge-base-web-page-element-view> + <dbp-knowledge-base-web-page-element-view lang="en" entry-point-url="${commonUtils.getAPiUrl()}" value="bedienstete/bibliothek/buch-ausleihen" text="Borrow a book"></dbp-knowledge-base-web-page-element-view> </div> <hr> <div class="container"> <p>mit Text in der WebComponent:</p> - <vpu-knowledge-base-web-page-element-view lang="${this.lang}" value="abc/def/xyz" text="FAQ"></vpu-knowledge-base-web-page-element-view> + <dbp-knowledge-base-web-page-element-view lang="${this.lang}" value="abc/def/xyz" text="FAQ"></dbp-knowledge-base-web-page-element-view> </div> <hr> <div class="container"> <p>ohne Text in der WebComponent:</p> Kontaktieren Sie uns unter... - <vpu-knowledge-base-web-page-element-view class="opt" lang="${this.lang}" value="abc/def/klm"></vpu-knowledge-base-web-page-element-view> + <dbp-knowledge-base-web-page-element-view class="opt" lang="${this.lang}" value="abc/def/klm"></dbp-knowledge-base-web-page-element-view> </div> </section> `; } } -commonUtils.defineCustomElement('vpu-knowledge-base-web-page-element-view-demo', KnowledgeBaseWebPageElementViewDemo); +commonUtils.defineCustomElement('dbp-knowledge-base-web-page-element-view-demo', KnowledgeBaseWebPageElementViewDemo); diff --git a/packages/knowledge-base-web-page-element-view/src/vpu-knowledge-base-web-page-element-view.js b/packages/knowledge-base-web-page-element-view/src/dbp-knowledge-base-web-page-element-view.js similarity index 54% rename from packages/knowledge-base-web-page-element-view/src/vpu-knowledge-base-web-page-element-view.js rename to packages/knowledge-base-web-page-element-view/src/dbp-knowledge-base-web-page-element-view.js index f11e7a53..15e828b2 100644 --- a/packages/knowledge-base-web-page-element-view/src/vpu-knowledge-base-web-page-element-view.js +++ b/packages/knowledge-base-web-page-element-view/src/dbp-knowledge-base-web-page-element-view.js @@ -1,4 +1,4 @@ -import * as commonUtils from "vpu-common/utils"; +import * as commonUtils from "dbp-common/utils"; import {KnowledgeBaseWebPageElementView} from './knowledge-base-web-page-element-view.js'; -commonUtils.defineCustomElement('vpu-knowledge-base-web-page-element-view', KnowledgeBaseWebPageElementView); +commonUtils.defineCustomElement('dbp-knowledge-base-web-page-element-view', KnowledgeBaseWebPageElementView); diff --git a/packages/knowledge-base-web-page-element-view/src/i18n.js b/packages/knowledge-base-web-page-element-view/src/i18n.js index 02c88eb4..3fb3a1af 100644 --- a/packages/knowledge-base-web-page-element-view/src/i18n.js +++ b/packages/knowledge-base-web-page-element-view/src/i18n.js @@ -1,4 +1,4 @@ -import {createInstance} from 'vpu-common/i18next.js'; +import {createInstance} from 'dbp-common/i18next.js'; import de from './i18n/de/translation.json'; import en from './i18n/en/translation.json'; diff --git a/packages/knowledge-base-web-page-element-view/src/knowledge-base-web-page-element-view.js b/packages/knowledge-base-web-page-element-view/src/knowledge-base-web-page-element-view.js index b07f0887..f60fcd57 100644 --- a/packages/knowledge-base-web-page-element-view/src/knowledge-base-web-page-element-view.js +++ b/packages/knowledge-base-web-page-element-view/src/knowledge-base-web-page-element-view.js @@ -1,8 +1,8 @@ import {i18n} from './i18n'; import {html, LitElement} from 'lit-element'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; -import {MiniSpinner} from 'vpu-common'; -import * as commonUtils from "vpu-common/utils"; +import {MiniSpinner} from 'dbp-common'; +import * as commonUtils from "dbp-common/utils"; import {unsafeHTML} from 'lit-html/directives/unsafe-html.js'; /** @@ -25,7 +25,7 @@ export class KnowledgeBaseWebPageElementView extends ScopedElementsMixin(LitElem static get scopedElements() { return { - 'vpu-mini-spinner': MiniSpinner, + 'dbp-mini-spinner': MiniSpinner, }; } @@ -60,7 +60,7 @@ export class KnowledgeBaseWebPageElementView extends ScopedElementsMixin(LitElem // }); // disabled, load first on toggle to visible - window.addEventListener("vpu-auth-init", () => that.loadWebPageElement()); + window.addEventListener("dbp-auth-init", () => that.loadWebPageElement()); } */ @@ -68,7 +68,7 @@ export class KnowledgeBaseWebPageElementView extends ScopedElementsMixin(LitElem * Loads the data from the web page element */ loadWebPageElement() { - if (window.VPUAuthToken === undefined || window.VPUAuthToken === "") { + if (window.DBPAuthToken === undefined || window.DBPAuthToken === "") { return; } @@ -81,7 +81,7 @@ export class KnowledgeBaseWebPageElementView extends ScopedElementsMixin(LitElem fetch(apiUrl, { headers: { 'Content-Type': 'application/ld+json', - 'Authorization': 'Bearer ' + window.VPUAuthToken, + 'Authorization': 'Bearer ' + window.DBPAuthToken, }, }) .then(function (res) { @@ -157,7 +157,7 @@ export class KnowledgeBaseWebPageElementView extends ScopedElementsMixin(LitElem img.src = this.eyeOpen; } if (this.html === '' && div.style.display !== 'none') { - this.html = "<vpu-mini-spinner></vpu-mini-spinner>"; + this.html = "<dbp-mini-spinner></dbp-mini-spinner>"; this.loadWebPageElement(); } } diff --git a/packages/knowledge-base-web-page-element-view/test/unit.js b/packages/knowledge-base-web-page-element-view/test/unit.js index b2682060..48263b32 100644 --- a/packages/knowledge-base-web-page-element-view/test/unit.js +++ b/packages/knowledge-base-web-page-element-view/test/unit.js @@ -1,11 +1,11 @@ -import '../src/vpu-knowledge-base-web-page-element-view.js'; -import '../src/vpu-knowledge-base-web-page-element-view-demo.js'; +import '../src/dbp-knowledge-base-web-page-element-view.js'; +import '../src/dbp-knowledge-base-web-page-element-view-demo.js'; -describe('vpu-knowledge-base-web-page-element-view basics', () => { +describe('dbp-knowledge-base-web-page-element-view basics', () => { let node; beforeEach(async () => { - node = document.createElement('vpu-knowledge-base-web-page-element-view'); + node = document.createElement('dbp-knowledge-base-web-page-element-view'); document.body.appendChild(node); await node.updateComplete; }); @@ -19,11 +19,11 @@ describe('vpu-knowledge-base-web-page-element-view basics', () => { }); }); -describe('vpu-knowledge-base-web-page-element-view demo', () => { +describe('dbp-knowledge-base-web-page-element-view demo', () => { let node; beforeEach(async () => { - node = document.createElement('vpu-knowledge-base-web-page-element-view-demo'); + node = document.createElement('dbp-knowledge-base-web-page-element-view-demo'); document.body.appendChild(node); await node.updateComplete; }); diff --git a/packages/language-select/.gitlab-ci.yml b/packages/language-select/.gitlab-ci.yml index 9cadb871..190b3a0c 100644 --- a/packages/language-select/.gitlab-ci.yml +++ b/packages/language-select/.gitlab-ci.yml @@ -3,7 +3,7 @@ image: debian:buster before_script: - apt update - apt install -y git - - "sed -i 's|git@gitlab.tugraz.at:VPU|../..|g' .gitmodules" + - "sed -i 's|git@gitlab.tugraz.at:dbp|../..|g' .gitmodules" - git submodule sync - git submodule update --init diff --git a/packages/language-select/.gitmodules b/packages/language-select/.gitmodules index d423707d..506f9e33 100644 --- a/packages/language-select/.gitmodules +++ b/packages/language-select/.gitmodules @@ -1,3 +1,3 @@ [submodule "vendor/common"] path = vendor/common - url = git@gitlab.tugraz.at:VPU/WebComponents/Common.git + url = git@gitlab.tugraz.at:dbp/web-components/Common.git diff --git a/packages/language-select/README.md b/packages/language-select/README.md index eea2184c..c28b3d93 100644 --- a/packages/language-select/README.md +++ b/packages/language-select/README.md @@ -1,12 +1,12 @@ # Language Select Web Component -[GitLab Repository](https://gitlab.tugraz.at/VPU/WebComponents/LanguageSelect) +[GitLab Repository](https://gitlab.tugraz.at/dbp/web-components/LanguageSelect) ## Local development ```bash # get the source -git clone git@gitlab.tugraz.at:VPU/WebComponents/LanguageSelect.git +git clone git@gitlab.tugraz.at:dbp/web-components/LanguageSelect.git cd LanguageSelect git submodule update --init diff --git a/packages/language-select/assets/index.html b/packages/language-select/assets/index.html index b993bba4..db81d16a 100644 --- a/packages/language-select/assets/index.html +++ b/packages/language-select/assets/index.html @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> - <script type="module" src="vpu-language-select-demo.js"></script> + <script type="module" src="dbp-language-select-demo.js"></script> <style> body { font-family: sans; @@ -11,6 +11,6 @@ </head> <body> - <vpu-language-select-demo></vpu-language-select-demo> + <dbp-language-select-demo></dbp-language-select-demo> </body> </html> diff --git a/packages/language-select/package.json b/packages/language-select/package.json index a755c4ac..1dea81cc 100644 --- a/packages/language-select/package.json +++ b/packages/language-select/package.json @@ -1,5 +1,5 @@ { - "name": "vpu-language-select", + "name": "dbp-language-select", "version": "1.0.0", "main": "src/index.js", "license": "LGPL-2.1-or-later", @@ -23,7 +23,7 @@ "rollup-plugin-terser": "^6.1.0", "rollup-plugin-delete": "^2.0.0", "i18next-scanner": "^2.10.2", - "vpu-common": "^1.0.0" + "dbp-common": "^1.0.0" }, "dependencies": { "@open-wc/scoped-elements": "^1.1.1", diff --git a/packages/language-select/rollup.config.js b/packages/language-select/rollup.config.js index 90e6dc56..96f5a585 100644 --- a/packages/language-select/rollup.config.js +++ b/packages/language-select/rollup.config.js @@ -12,7 +12,7 @@ const build = (typeof process.env.BUILD !== 'undefined') ? process.env.BUILD : ' console.log("build: " + build); export default { - input: (build != 'test') ? ['src/vpu-language-select.js', 'src/vpu-language-select-demo.js'] : glob.sync('test/**/*.js'), + input: (build != 'test') ? ['src/dbp-language-select.js', 'src/dbp-language-select-demo.js'] : glob.sync('test/**/*.js'), output: { dir: 'dist', entryFileNames: '[name].js', diff --git a/packages/language-select/src/vpu-language-select-demo.js b/packages/language-select/src/dbp-language-select-demo.js similarity index 62% rename from packages/language-select/src/vpu-language-select-demo.js rename to packages/language-select/src/dbp-language-select-demo.js index 955b47c5..e4518ed1 100644 --- a/packages/language-select/src/vpu-language-select-demo.js +++ b/packages/language-select/src/dbp-language-select-demo.js @@ -1,6 +1,6 @@ import {html, LitElement} from 'lit-element'; import {LanguageSelect} from './language-select.js'; -import * as commonUtils from 'vpu-common/utils'; +import * as commonUtils from 'dbp-common/utils'; import { ScopedElementsMixin } from '@open-wc/scoped-elements'; @@ -24,11 +24,11 @@ class LanguageSelectDisplay extends LitElement { connectedCallback() { super.connectedCallback(); - window.addEventListener('vpu-language-changed', this.handleChange); + window.addEventListener('dbp-language-changed', this.handleChange); } disconnectedCallback() { - window.removeEventListener('vpu-language-changed', this.handleChange); + window.removeEventListener('dbp-language-changed', this.handleChange); super.disconnectedCallback(); } @@ -45,25 +45,25 @@ class LanguageSelectDemo extends ScopedElementsMixin(LitElement) { static get scopedElements() { return { - 'vpu-language-select': LanguageSelect, - 'vpu-language-select-display': LanguageSelectDisplay, + 'dbp-language-select': LanguageSelect, + 'dbp-language-select-display': LanguageSelectDisplay, }; } render() { return html` - Select 1: <vpu-language-select></vpu-language-select> + Select 1: <dbp-language-select></dbp-language-select> <br> <br> - Select 2: <vpu-language-select></vpu-language-select> + Select 2: <dbp-language-select></dbp-language-select> <br> <br> - Current language 1: <vpu-language-select-display></vpu-language-select-display> + Current language 1: <dbp-language-select-display></dbp-language-select-display> <br> <br> - Current language 2: <vpu-language-select-display></vpu-language-select-display> + Current language 2: <dbp-language-select-display></dbp-language-select-display> `; } } -commonUtils.defineCustomElement('vpu-language-select-demo', LanguageSelectDemo); +commonUtils.defineCustomElement('dbp-language-select-demo', LanguageSelectDemo); diff --git a/packages/language-select/src/dbp-language-select.js b/packages/language-select/src/dbp-language-select.js new file mode 100644 index 00000000..dc07a920 --- /dev/null +++ b/packages/language-select/src/dbp-language-select.js @@ -0,0 +1,4 @@ +import * as commonUtils from 'dbp-common/utils'; +import {LanguageSelect} from './language-select.js'; + +commonUtils.defineCustomElement('dbp-language-select', LanguageSelect); diff --git a/packages/language-select/src/demo.js b/packages/language-select/src/demo.js index 372555e2..971c48df 100644 --- a/packages/language-select/src/demo.js +++ b/packages/language-select/src/demo.js @@ -1 +1 @@ -import './vpu-language-select-demo.js'; \ No newline at end of file +import './dbp-language-select-demo.js'; \ No newline at end of file diff --git a/packages/language-select/src/i18n.js b/packages/language-select/src/i18n.js index 02c88eb4..3fb3a1af 100644 --- a/packages/language-select/src/i18n.js +++ b/packages/language-select/src/i18n.js @@ -1,4 +1,4 @@ -import {createInstance} from 'vpu-common/i18next.js'; +import {createInstance} from 'dbp-common/i18next.js'; import de from './i18n/de/translation.json'; import en from './i18n/en/translation.json'; diff --git a/packages/language-select/src/language-select.js b/packages/language-select/src/language-select.js index f3464ea1..9f05f43b 100644 --- a/packages/language-select/src/language-select.js +++ b/packages/language-select/src/language-select.js @@ -1,9 +1,9 @@ import {html, css, LitElement} from 'lit-element'; import {i18n} from './i18n.js'; -import * as commonStyles from 'vpu-common/styles'; +import * as commonStyles from 'dbp-common/styles'; /** - * Emits a vpu-language-changed event where event.detail.lang is the new selected language + * Emits a dbp-language-changed event where event.detail.lang is the new selected language */ export class LanguageSelect extends LitElement { @@ -53,7 +53,7 @@ export class LanguageSelect extends LitElement { this.requestUpdate('next', oldNext); if (oldValue !== value) { - const event = new CustomEvent("vpu-language-changed", { + const event = new CustomEvent("dbp-language-changed", { bubbles: true, composed: true, detail: {'lang': value} @@ -88,8 +88,8 @@ export class LanguageSelect extends LitElement { } a:hover { - background-color: var(--vpu-dark); - color: var(--vpu-light); + background-color: var(--dbp-dark); + color: var(--dbp-light); transition: none; } @@ -98,8 +98,8 @@ export class LanguageSelect extends LitElement { display: inline-block; text-decoration: none; transition: background-color 0.15s, color 0.15s; - color: var(--vpu-dark); - border-radius: var(--vpu-border-radius); + color: var(--dbp-dark); + border-radius: var(--dbp-border-radius); } ` ]; @@ -111,11 +111,11 @@ export class LanguageSelect extends LitElement { connectedCallback() { super.connectedCallback(); - window.addEventListener('vpu-language-changed', this.onExternalChange); + window.addEventListener('dbp-language-changed', this.onExternalChange); } disconnectedCallback() { - document.removeEventListener('vpu-language-changed', this.onExternalChange); + document.removeEventListener('dbp-language-changed', this.onExternalChange); super.disconnectedCallback(); } diff --git a/packages/language-select/src/vpu-language-select.js b/packages/language-select/src/vpu-language-select.js deleted file mode 100644 index 97dcfdf6..00000000 --- a/packages/language-select/src/vpu-language-select.js +++ /dev/null @@ -1,4 +0,0 @@ -import * as commonUtils from 'vpu-common/utils'; -import {LanguageSelect} from './language-select.js'; - -commonUtils.defineCustomElement('vpu-language-select', LanguageSelect); diff --git a/packages/language-select/test/unit.js b/packages/language-select/test/unit.js index b79ca875..54fb5b9d 100644 --- a/packages/language-select/test/unit.js +++ b/packages/language-select/test/unit.js @@ -1,7 +1,7 @@ -import '../src/vpu-language-select.js'; +import '../src/dbp-language-select.js'; import '../src/demo.js'; -describe('vpu-language-select basics', () => { +describe('dbp-language-select basics', () => { let node; let events = []; @@ -11,15 +11,15 @@ describe('vpu-language-select basics', () => { beforeEach(async () => { events.length = 0; - window.addEventListener('vpu-language-changed', handler); - node = document.createElement('vpu-language-select'); + window.addEventListener('dbp-language-changed', handler); + node = document.createElement('dbp-language-select'); document.body.appendChild(node); await node.updateComplete; }); afterEach(() => { node.remove(); - window.removeEventListener('vpu-language-changed', handler); + window.removeEventListener('dbp-language-changed', handler); }); it('should render', () => { @@ -46,11 +46,11 @@ describe('vpu-language-select basics', () => { }); }); -describe('vpu-language-select demo', () => { +describe('dbp-language-select demo', () => { let node; beforeEach(async () => { - node = document.createElement('vpu-language-select-demo'); + node = document.createElement('dbp-language-select-demo'); document.body.appendChild(node); await node.updateComplete; }); diff --git a/packages/notification/.gitlab-ci.yml b/packages/notification/.gitlab-ci.yml index 9cadb871..190b3a0c 100644 --- a/packages/notification/.gitlab-ci.yml +++ b/packages/notification/.gitlab-ci.yml @@ -3,7 +3,7 @@ image: debian:buster before_script: - apt update - apt install -y git - - "sed -i 's|git@gitlab.tugraz.at:VPU|../..|g' .gitmodules" + - "sed -i 's|git@gitlab.tugraz.at:dbp|../..|g' .gitmodules" - git submodule sync - git submodule update --init diff --git a/packages/notification/.gitmodules b/packages/notification/.gitmodules index d423707d..506f9e33 100644 --- a/packages/notification/.gitmodules +++ b/packages/notification/.gitmodules @@ -1,3 +1,3 @@ [submodule "vendor/common"] path = vendor/common - url = git@gitlab.tugraz.at:VPU/WebComponents/Common.git + url = git@gitlab.tugraz.at:dbp/web-components/Common.git diff --git a/packages/notification/README.md b/packages/notification/README.md index 3a07dad7..1826d517 100644 --- a/packages/notification/README.md +++ b/packages/notification/README.md @@ -1,17 +1,17 @@ # Notification Web Component -[GitLab Repository](https://gitlab.tugraz.at/VPU/WebComponents/Notification) +[GitLab Repository](https://gitlab.tugraz.at/dbp/web-components/Notification) ## Usage ```html -<vpu-notification></vpu-notification> +<dbp-notification></dbp-notification> ``` ## Attributes - `lang` (optional, default: `de`): set to `de` or `en` for German or English - - example `<vpu-notification lang="de" client-id="my-client-id"></vpu-notification>` + - example `<dbp-notification lang="de" client-id="my-client-id"></dbp-notification>` ## Sending notifications @@ -30,7 +30,7 @@ send({ ```bash # get the source -git clone git@gitlab.tugraz.at:VPU/WebComponents/Notification.git +git clone git@gitlab.tugraz.at:dbp/web-components/Notification.git cd Notification git submodule update --init diff --git a/packages/notification/assets/index.html b/packages/notification/assets/index.html index 2cb1d5f3..6343c0e1 100644 --- a/packages/notification/assets/index.html +++ b/packages/notification/assets/index.html @@ -2,12 +2,12 @@ <html> <head> <meta charset="UTF-8"> - <script type="module" src="vpu-notification-demo.js"></script> + <script type="module" src="dbp-notification-demo.js"></script> </head> <body> -<vpu-notification-demo lang="de"></vpu-notification-demo> +<dbp-notification-demo lang="de"></dbp-notification-demo> </body> </html> diff --git a/packages/notification/package.json b/packages/notification/package.json index ac0b20bd..8f9f8a92 100644 --- a/packages/notification/package.json +++ b/packages/notification/package.json @@ -1,5 +1,5 @@ { - "name": "vpu-notification", + "name": "dbp-notification", "version": "1.0.0", "main": "src/index.js", "license": "LGPL-2.1-or-later", @@ -24,7 +24,7 @@ "rollup-plugin-json": "^4.0.0", "rollup-plugin-url": "^3.0.1", "i18next-scanner": "^2.10.2", - "vpu-common": "^1.0.0" + "dbp-common": "^1.0.0" }, "dependencies": { "@open-wc/scoped-elements": "^1.1.1", diff --git a/packages/notification/rollup.config.js b/packages/notification/rollup.config.js index e0b5ff3d..e84aa1c9 100644 --- a/packages/notification/rollup.config.js +++ b/packages/notification/rollup.config.js @@ -13,7 +13,7 @@ const build = (typeof process.env.BUILD !== 'undefined') ? process.env.BUILD : ' console.log("build: " + build); export default { - input: (build != 'test') ? ['src/vpu-notification.js', 'src/vpu-notification-demo.js'] : glob.sync('test/**/*.js'), + input: (build != 'test') ? ['src/dbp-notification.js', 'src/dbp-notification-demo.js'] : glob.sync('test/**/*.js'), output: { dir: 'dist', entryFileNames: '[name].js', diff --git a/packages/notification/src/vpu-notification-demo.js b/packages/notification/src/dbp-notification-demo.js similarity index 85% rename from packages/notification/src/vpu-notification-demo.js rename to packages/notification/src/dbp-notification-demo.js index d3288c35..163c4824 100644 --- a/packages/notification/src/vpu-notification-demo.js +++ b/packages/notification/src/dbp-notification-demo.js @@ -1,10 +1,10 @@ import {i18n} from './i18n'; -import {send as notify} from 'vpu-common/notification'; +import {send as notify} from 'dbp-common/notification'; import {css, html, LitElement} from 'lit-element'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import {Notification} from './notification.js'; -import * as commonUtils from 'vpu-common/utils'; -import * as commonStyles from "vpu-common/styles"; +import * as commonUtils from 'dbp-common/utils'; +import * as commonStyles from "dbp-common/styles"; class NotificationDemo extends ScopedElementsMixin(LitElement) { constructor() { @@ -14,7 +14,7 @@ class NotificationDemo extends ScopedElementsMixin(LitElement) { static get scopedElements() { return { - 'vpu-notification': Notification, + 'dbp-notification': Notification, }; } @@ -55,7 +55,7 @@ class NotificationDemo extends ScopedElementsMixin(LitElement) { </div> </div> <div class="container"> - <vpu-notification lang="${this.lang}"></vpu-notification> + <dbp-notification lang="${this.lang}"></dbp-notification> </div> </section> `; @@ -72,4 +72,4 @@ class NotificationDemo extends ScopedElementsMixin(LitElement) { } } -commonUtils.defineCustomElement('vpu-notification-demo', NotificationDemo); +commonUtils.defineCustomElement('dbp-notification-demo', NotificationDemo); diff --git a/packages/notification/src/dbp-notification.js b/packages/notification/src/dbp-notification.js new file mode 100644 index 00000000..8cac8180 --- /dev/null +++ b/packages/notification/src/dbp-notification.js @@ -0,0 +1,4 @@ +import * as commonUtils from 'dbp-common/utils'; +import {Notification} from './notification.js'; + +commonUtils.defineCustomElement('dbp-notification', Notification); diff --git a/packages/notification/src/i18n.js b/packages/notification/src/i18n.js index 02c88eb4..3fb3a1af 100644 --- a/packages/notification/src/i18n.js +++ b/packages/notification/src/i18n.js @@ -1,4 +1,4 @@ -import {createInstance} from 'vpu-common/i18next.js'; +import {createInstance} from 'dbp-common/i18next.js'; import de from './i18n/de/translation.json'; import en from './i18n/en/translation.json'; diff --git a/packages/notification/src/notification.js b/packages/notification/src/notification.js index dccfbaff..9a815416 100644 --- a/packages/notification/src/notification.js +++ b/packages/notification/src/notification.js @@ -1,14 +1,14 @@ import {i18n} from './i18n'; import {createUUID} from './utils' import {css, html} from 'lit-element'; -import VPULitElement from 'vpu-common/vpu-lit-element'; -import * as commonUtils from 'vpu-common/utils'; -import * as commonStyles from 'vpu-common/styles'; +import DBPLitElement from 'dbp-common/dbp-lit-element'; +import * as commonUtils from 'dbp-common/utils'; +import * as commonStyles from 'dbp-common/styles'; /** * Notification web component */ -export class Notification extends VPULitElement { +export class Notification extends DBPLitElement { constructor() { super(); this.lang = 'de'; @@ -28,7 +28,7 @@ export class Notification extends VPULitElement { i18n.changeLanguage(this.lang); const that = this; - const listener = window.addEventListener("vpu-notification-send", (e) => { + const listener = window.addEventListener("dbp-notification-send", (e) => { if (typeof e.detail === 'undefined') { return; } @@ -41,7 +41,7 @@ export class Notification extends VPULitElement { const summary = typeof e.detail.summary !== 'undefined' ? e.detail.summary : ""; const timeout = typeof e.detail.timeout !== 'undefined' ? e.detail.timeout : 0; const icon = typeof e.detail.icon !== 'undefined' ? e.detail.icon : ''; - const iconHTML = icon !== '' ? `<vpu-icon name="${icon}"></vpu-icon>` : ""; + const iconHTML = icon !== '' ? `<dbp-icon name="${icon}"></dbp-icon>` : ""; const summaryHTML = summary !== "" ? `<h3>${summary}</h3>` : ""; that.notificationBlock.innerHTML = ` diff --git a/packages/notification/src/vpu-notification.js b/packages/notification/src/vpu-notification.js deleted file mode 100644 index abe4e9b8..00000000 --- a/packages/notification/src/vpu-notification.js +++ /dev/null @@ -1,4 +0,0 @@ -import * as commonUtils from 'vpu-common/utils'; -import {Notification} from './notification.js'; - -commonUtils.defineCustomElement('vpu-notification', Notification); diff --git a/packages/notification/test/unit.js b/packages/notification/test/unit.js index e5bc6f75..786cfacb 100644 --- a/packages/notification/test/unit.js +++ b/packages/notification/test/unit.js @@ -1,10 +1,10 @@ -import '../src/vpu-notification'; +import '../src/dbp-notification'; -describe('vpu-notification basics', () => { +describe('dbp-notification basics', () => { let node; beforeEach(async () => { - node = document.createElement('vpu-notification'); + node = document.createElement('dbp-notification'); document.body.appendChild(node); await node.updateComplete; }); diff --git a/packages/person-profile/.gitlab-ci.yml b/packages/person-profile/.gitlab-ci.yml index 9cadb871..190b3a0c 100644 --- a/packages/person-profile/.gitlab-ci.yml +++ b/packages/person-profile/.gitlab-ci.yml @@ -3,7 +3,7 @@ image: debian:buster before_script: - apt update - apt install -y git - - "sed -i 's|git@gitlab.tugraz.at:VPU|../..|g' .gitmodules" + - "sed -i 's|git@gitlab.tugraz.at:dbp|../..|g' .gitmodules" - git submodule sync - git submodule update --init diff --git a/packages/person-profile/.gitmodules b/packages/person-profile/.gitmodules index aaa7d63d..556fe0c2 100644 --- a/packages/person-profile/.gitmodules +++ b/packages/person-profile/.gitmodules @@ -1,9 +1,9 @@ [submodule "vendor/auth"] path = vendor/auth - url = git@gitlab.tugraz.at:VPU/WebComponents/Auth.git + url = git@gitlab.tugraz.at:dbp/web-components/Auth.git [submodule "vendor/common"] path = vendor/common - url = git@gitlab.tugraz.at:VPU/WebComponents/Common.git + url = git@gitlab.tugraz.at:dbp/web-components/Common.git [submodule "vendor/person-select"] path = vendor/person-select - url = git@gitlab.tugraz.at:VPU/WebComponents/PersonSelect.git + url = git@gitlab.tugraz.at:dbp/web-components/PersonSelect.git diff --git a/packages/person-profile/README.md b/packages/person-profile/README.md index 84e2639a..566162e0 100644 --- a/packages/person-profile/README.md +++ b/packages/person-profile/README.md @@ -1,27 +1,27 @@ # Person Profile Web Component -[GitLab Repository](https://gitlab.tugraz.at/VPU/WebComponents/PersonProfile) +[GitLab Repository](https://gitlab.tugraz.at/dbp/web-components/PersonProfile) ## Usage ```html -<vpu-person-profile></vpu-person-profile> +<dbp-person-profile></dbp-person-profile> ``` ## Attributes - `lang` (optional, default: `de`): set to `de` or `en` for German or English - - example `<vpu-person-profile lang="de"></vpu-person-profile>` + - example `<dbp-person-profile lang="de"></dbp-person-profile>` - `entry-point-url` (optional, default is the TU Graz entry point url): entry point url to access the api - - example `<vpu-person-profile entry-point-url="http://127.0.0.1:8000"></vpu-person-profile>` + - example `<dbp-person-profile entry-point-url="http://127.0.0.1:8000"></dbp-person-profile>` - `value` (optional): api path of person to preload the selector with - - example `<vpu-person-profile value="/people/testuser"></vpu-person-profile>` + - example `<dbp-person-profile value="/people/testuser"></dbp-person-profile>` ## Local development ```bash # get the source -git clone git@gitlab.tugraz.at:VPU/WebComponents/PersonProfile.git +git clone git@gitlab.tugraz.at:dbp/web-components/PersonProfile.git cd PersonProfile git submodule update --init diff --git a/packages/person-profile/assets/index.html b/packages/person-profile/assets/index.html index 9496a9d4..8ae0d442 100644 --- a/packages/person-profile/assets/index.html +++ b/packages/person-profile/assets/index.html @@ -2,11 +2,11 @@ <html> <head> <meta charset="UTF-8"> - <script type="module" src="vpu-person-profile-demo.js"></script> + <script type="module" src="dbp-person-profile-demo.js"></script> </head> <body> -<vpu-person-profile-demo lang="de"></vpu-person-profile-demo> +<dbp-person-profile-demo lang="de"></dbp-person-profile-demo> </body> </html> diff --git a/packages/person-profile/package.json b/packages/person-profile/package.json index 860bf3ca..fd8390bc 100644 --- a/packages/person-profile/package.json +++ b/packages/person-profile/package.json @@ -1,5 +1,5 @@ { - "name": "vpu-person-profile", + "name": "dbp-person-profile", "version": "1.0.0", "main": "src/index.js", "license": "LGPL-2.1-or-later", @@ -24,9 +24,9 @@ "rollup-plugin-delete": "^2.0.0", "rollup-plugin-url": "^3.0.1", "i18next-scanner": "^2.10.2", - "vpu-auth": "^1.0.0", - "vpu-common": "^1.0.0", - "vpu-person-select": "^1.0.0" + "dbp-auth": "^1.0.0", + "dbp-common": "^1.0.0", + "dbp-person-select": "^1.0.0" }, "dependencies": { "@open-wc/scoped-elements": "^1.1.1", diff --git a/packages/person-profile/rollup.config.js b/packages/person-profile/rollup.config.js index c8af63d0..53628e28 100644 --- a/packages/person-profile/rollup.config.js +++ b/packages/person-profile/rollup.config.js @@ -14,7 +14,7 @@ const build = (typeof process.env.BUILD !== 'undefined') ? process.env.BUILD : ' console.log("build: " + build); export default { - input: (build != 'test') ? ['src/vpu-person-profile.js', 'src/vpu-person-profile-demo.js'] : glob.sync('test/**/*.js'), + input: (build != 'test') ? ['src/dbp-person-profile.js', 'src/dbp-person-profile-demo.js'] : glob.sync('test/**/*.js'), output: { dir: 'dist', entryFileNames: '[name].js', @@ -51,7 +51,7 @@ export default { copy({ targets: [ {src: 'assets/index.html', dest: 'dist'}, - {src: 'node_modules/vpu-common/assets/icons/*.svg', dest: 'dist/local/vpu-common/icons'}, + {src: 'node_modules/dbp-common/assets/icons/*.svg', dest: 'dist/local/dbp-common/icons'}, ], }), (process.env.ROLLUP_WATCH === 'true') ? serve({contentBase: 'dist', host: '127.0.0.1', port: 8002}) : false diff --git a/packages/person-profile/src/vpu-person-profile-demo.js b/packages/person-profile/src/dbp-person-profile-demo.js similarity index 66% rename from packages/person-profile/src/vpu-person-profile-demo.js rename to packages/person-profile/src/dbp-person-profile-demo.js index b9d81b3d..0bdd5a1f 100644 --- a/packages/person-profile/src/vpu-person-profile-demo.js +++ b/packages/person-profile/src/dbp-person-profile-demo.js @@ -1,15 +1,15 @@ -import {AuthKeycloak, LoginButton} from 'vpu-auth'; +import {AuthKeycloak, LoginButton} from 'dbp-auth'; import {i18n} from './i18n.js'; import {css, html} from 'lit-element'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; -import VPULitElement from 'vpu-common/vpu-lit-element'; +import DBPLitElement from 'dbp-common/dbp-lit-element'; import {PersonProfile} from './index.js'; -import * as commonUtils from 'vpu-common/utils'; -import * as commonStyles from 'vpu-common/styles'; +import * as commonUtils from 'dbp-common/utils'; +import * as commonStyles from 'dbp-common/styles'; import $ from 'jquery'; -import {PersonSelect} from 'vpu-person-select'; +import {PersonSelect} from 'dbp-person-select'; -class PersonProfileDemo extends ScopedElementsMixin(VPULitElement) { +class PersonProfileDemo extends ScopedElementsMixin(DBPLitElement) { constructor() { super(); this.lang = 'de'; @@ -20,10 +20,10 @@ class PersonProfileDemo extends ScopedElementsMixin(VPULitElement) { static get scopedElements() { return { - 'vpu-person-profile': PersonProfile, - 'vpu-auth-keycloak': AuthKeycloak, - 'vpu-login-button': LoginButton, - 'vpu-person-select': PersonSelect, + 'dbp-person-profile': PersonProfile, + 'dbp-auth-keycloak': AuthKeycloak, + 'dbp-login-button': LoginButton, + 'dbp-person-select': PersonSelect, }; } @@ -42,11 +42,11 @@ class PersonProfileDemo extends ScopedElementsMixin(VPULitElement) { const that = this; this.updateComplete.then(()=>{ - window.addEventListener("vpu-auth-person-init", () => { - that.person = window.VPUPersonId; + window.addEventListener("dbp-auth-person-init", () => { + that.person = window.DBPPersonId; }); - const personSelect = that._(this.constructor.getScopedTagName('vpu-person-select')); + const personSelect = that._(this.constructor.getScopedTagName('dbp-person-select')); personSelect.onchange = function () { that.selectedPerson = $(this).data("object").identifier; }; @@ -69,8 +69,8 @@ class PersonProfileDemo extends ScopedElementsMixin(VPULitElement) { return this.noAuth ? html`` : html` <header> <div class="container"> - <vpu-auth-keycloak lang="${this.lang}" url="https://auth-dev.tugraz.at/auth" realm="tugraz" client-id="auth-dev-mw-frontend-local" load-person try-login></vpu-auth-keycloak> - <vpu-login-button lang="${this.lang}" show-image></vpu-login-button> + <dbp-auth-keycloak lang="${this.lang}" url="https://auth-dev.tugraz.at/auth" realm="tugraz" client-id="auth-dev-mw-frontend-local" load-person try-login></dbp-auth-keycloak> + <dbp-login-button lang="${this.lang}" show-image></dbp-login-button> </div> </header> `; @@ -85,7 +85,7 @@ class PersonProfileDemo extends ScopedElementsMixin(VPULitElement) { <h1 class="title">Person-Profile-Demo</h1> </div> <div class="container"> - <vpu-person-profile lang="${this.lang}" entry-point-url="${commonUtils.getAPiUrl()}" value="${this.person}"></vpu-person-profile> + <dbp-person-profile lang="${this.lang}" entry-point-url="${commonUtils.getAPiUrl()}" value="${this.person}"></dbp-person-profile> </div> </section> <section class="section"> @@ -93,14 +93,14 @@ class PersonProfileDemo extends ScopedElementsMixin(VPULitElement) { <h1 class="title">Select-Profile-Demo</h1> </div> <div class="container"> - <vpu-person-select lang="${this.lang}" entry-point-url="${commonUtils.getAPiUrl()}"></vpu-person-select> + <dbp-person-select lang="${this.lang}" entry-point-url="${commonUtils.getAPiUrl()}"></dbp-person-select> </div> <div class="container"> - <vpu-person-profile lang="${this.lang}" entry-point-url="${commonUtils.getAPiUrl()}" value="${this.selectedPerson}"></vpu-person-profile> + <dbp-person-profile lang="${this.lang}" entry-point-url="${commonUtils.getAPiUrl()}" value="${this.selectedPerson}"></dbp-person-profile> </div> </section> `; } } -commonUtils.defineCustomElement('vpu-person-profile-demo', PersonProfileDemo); +commonUtils.defineCustomElement('dbp-person-profile-demo', PersonProfileDemo); diff --git a/packages/person-profile/src/dbp-person-profile.js b/packages/person-profile/src/dbp-person-profile.js new file mode 100644 index 00000000..08ed08d1 --- /dev/null +++ b/packages/person-profile/src/dbp-person-profile.js @@ -0,0 +1,4 @@ +import * as commonUtils from 'dbp-common/utils'; +import {PersonProfile} from './person-profile.js'; + +commonUtils.defineCustomElement('dbp-person-profile', PersonProfile); diff --git a/packages/person-profile/src/i18n.js b/packages/person-profile/src/i18n.js index 02c88eb4..3fb3a1af 100644 --- a/packages/person-profile/src/i18n.js +++ b/packages/person-profile/src/i18n.js @@ -1,4 +1,4 @@ -import {createInstance} from 'vpu-common/i18next.js'; +import {createInstance} from 'dbp-common/i18next.js'; import de from './i18n/de/translation.json'; import en from './i18n/en/translation.json'; diff --git a/packages/person-profile/src/person-profile.js b/packages/person-profile/src/person-profile.js index 5065f40d..e79da619 100644 --- a/packages/person-profile/src/person-profile.js +++ b/packages/person-profile/src/person-profile.js @@ -1,13 +1,13 @@ -import JSONLD from 'vpu-common/jsonld'; +import JSONLD from 'dbp-common/jsonld'; import {css, html} from 'lit-element'; import {i18n} from './i18n.js'; -import VPULitElement from 'vpu-common/vpu-lit-element'; -import * as commonUtils from 'vpu-common/utils'; -import * as commonStyles from 'vpu-common/styles'; +import DBPLitElement from 'dbp-common/dbp-lit-element'; +import * as commonUtils from 'dbp-common/utils'; +import * as commonStyles from 'dbp-common/styles'; -export class PersonProfile extends VPULitElement { +export class PersonProfile extends DBPLitElement { constructor() { super(); @@ -56,7 +56,7 @@ export class PersonProfile extends VPULitElement { fetch(apiUrl, { headers: { 'Content-Type': 'application/ld+json', - 'Authorization': 'Bearer ' + window.VPUAuthToken, + 'Authorization': 'Bearer ' + window.DBPAuthToken, }, }) .then(response => response.json()) diff --git a/packages/person-profile/src/vpu-person-profile.js b/packages/person-profile/src/vpu-person-profile.js deleted file mode 100644 index a74ff7aa..00000000 --- a/packages/person-profile/src/vpu-person-profile.js +++ /dev/null @@ -1,4 +0,0 @@ -import * as commonUtils from 'vpu-common/utils'; -import {PersonProfile} from './person-profile.js'; - -commonUtils.defineCustomElement('vpu-person-profile', PersonProfile); diff --git a/packages/person-profile/test/unit.js b/packages/person-profile/test/unit.js index 4db121fd..8635f113 100644 --- a/packages/person-profile/test/unit.js +++ b/packages/person-profile/test/unit.js @@ -1,10 +1,10 @@ -import '../src/vpu-person-profile-demo.js'; +import '../src/dbp-person-profile-demo.js'; -describe('vpu-person-profile demo', () => { +describe('dbp-person-profile demo', () => { let node; beforeEach(async () => { - node = document.createElement('vpu-person-profile-demo'); + node = document.createElement('dbp-person-profile-demo'); document.body.appendChild(node); await node.updateComplete; }); diff --git a/packages/person-select/.gitlab-ci.yml b/packages/person-select/.gitlab-ci.yml index 9cadb871..190b3a0c 100644 --- a/packages/person-select/.gitlab-ci.yml +++ b/packages/person-select/.gitlab-ci.yml @@ -3,7 +3,7 @@ image: debian:buster before_script: - apt update - apt install -y git - - "sed -i 's|git@gitlab.tugraz.at:VPU|../..|g' .gitmodules" + - "sed -i 's|git@gitlab.tugraz.at:dbp|../..|g' .gitmodules" - git submodule sync - git submodule update --init diff --git a/packages/person-select/.gitmodules b/packages/person-select/.gitmodules index f997e57d..6ae19f67 100644 --- a/packages/person-select/.gitmodules +++ b/packages/person-select/.gitmodules @@ -1,6 +1,6 @@ [submodule "vendor/auth"] path = vendor/auth - url = git@gitlab.tugraz.at:VPU/WebComponents/Auth.git + url = git@gitlab.tugraz.at:dbp/web-components/Auth.git [submodule "vendor/common"] path = vendor/common - url = git@gitlab.tugraz.at:VPU/WebComponents/Common.git + url = git@gitlab.tugraz.at:dbp/web-components/Common.git diff --git a/packages/person-select/README.md b/packages/person-select/README.md index da52aad9..bdd8e3f2 100644 --- a/packages/person-select/README.md +++ b/packages/person-select/README.md @@ -1,39 +1,39 @@ # Person Select Web Component -[GitLab Repository](https://gitlab.tugraz.at/VPU/WebComponents/PersonSelect) +[GitLab Repository](https://gitlab.tugraz.at/dbp/web-components/PersonSelect) ## Usage ```html -<vpu-person-select></vpu-person-select> +<dbp-person-select></dbp-person-select> ``` ## Attributes - `lang` (optional, default: `de`): set to `de` or `en` for German or English - - example `<vpu-person-select lang="de"></vpu-person-select>` + - example `<dbp-person-select lang="de"></dbp-person-select>` - `entry-point-url` (optional, default is the TU Graz entry point url): entry point url to access the api - - example `<vpu-person-select entry-point-url="http://127.0.0.1:8000"></vpu-person-select>` + - example `<dbp-person-select entry-point-url="http://127.0.0.1:8000"></dbp-person-select>` - `value` (optional): api path of person to preload the selector with - - example `<vpu-person-select value="/people/testuser"></vpu-person-select>` + - example `<dbp-person-select value="/people/testuser"></dbp-person-select>` - the `value` will also be set automatically when a person is chosen in the selector - `data-object` (read-only): when a person is selected the person object will be set as json string - - example `<vpu-person-select data-object="{"@id":"/people/testuser", "@type":"http://schema.org/Person", "identifier":"testuser", "givenName":"Hans", "familyName":"Tester", "honorificSuffix":"Ing.", "telephone":"+43 (876) 123-4567", "phoneExtension":"4567", "email":"hans.tester@email.com", "name":"Hans Tester"}"></vpu-person-select>` + - example `<dbp-person-select data-object="{"@id":"/people/testuser", "@type":"http://schema.org/Person", "identifier":"testuser", "givenName":"Hans", "familyName":"Tester", "honorificSuffix":"Ing.", "telephone":"+43 (876) 123-4567", "phoneExtension":"4567", "email":"hans.tester@email.com", "name":"Hans Tester"}"></dbp-person-select>` - `show-birth-date` (optional): also shows the birth date of the persons to distinguish people with the same name - the currently logged in user needs to have permissions to show the birth date of people - - example `<vpu-person-select show-birth-date></vpu-person-select>` + - example `<dbp-person-select show-birth-date></dbp-person-select>` - `show-reload-button` (optional): if set a reload button will be viewed next to the select box - the button triggers a `change` event on the web component - the button is disabled if no person is selected - - example `<vpu-person-select show-reload-button></vpu-person-select>` + - example `<dbp-person-select show-reload-button></dbp-person-select>` - `reload-button-title` (optional): sets a title text on the reload button - - example `<vpu-person-select show-reload-button reload-button-text="Reload result list"></vpu-person-select>` + - example `<dbp-person-select show-reload-button reload-button-text="Reload result list"></dbp-person-select>` ## Local development ```bash # get the source -git clone git@gitlab.tugraz.at:VPU/WebComponents/PersonSelect.git +git clone git@gitlab.tugraz.at:dbp/web-components/PersonSelect.git cd PersonSelect git submodule update --init diff --git a/packages/person-select/assets/index.html b/packages/person-select/assets/index.html index a0194530..088bf634 100644 --- a/packages/person-select/assets/index.html +++ b/packages/person-select/assets/index.html @@ -2,11 +2,11 @@ <html> <head> <meta charset="UTF-8"> - <script type="module" src="vpu-person-select-demo.js"></script> + <script type="module" src="dbp-person-select-demo.js"></script> </head> <body> -<vpu-person-select-demo lang="de"></vpu-person-select-demo> +<dbp-person-select-demo lang="de"></dbp-person-select-demo> </body> </html> diff --git a/packages/person-select/package.json b/packages/person-select/package.json index 6c595c79..b088012b 100644 --- a/packages/person-select/package.json +++ b/packages/person-select/package.json @@ -1,5 +1,5 @@ { - "name": "vpu-person-select", + "name": "dbp-person-select", "version": "1.0.0", "main": "src/index.js", "license": "LGPL-2.1-or-later", @@ -25,8 +25,8 @@ "@rollup/plugin-node-resolve": "^8.1.0", "@rollup/plugin-replace": "^2.3.3", "@rollup/plugin-url": "^5.0.1", - "vpu-auth": "^1.0.0", - "vpu-common": "^1.0.0" + "dbp-auth": "^1.0.0", + "dbp-common": "^1.0.0" }, "dependencies": { "@open-wc/scoped-elements": "^1.1.1", diff --git a/packages/person-select/rollup.config.js b/packages/person-select/rollup.config.js index 8580dcbc..cf08aa6f 100644 --- a/packages/person-select/rollup.config.js +++ b/packages/person-select/rollup.config.js @@ -13,7 +13,7 @@ const build = (typeof process.env.BUILD !== 'undefined') ? process.env.BUILD : ' console.log("build: " + build); export default { - input: (build != 'test') ? ['src/vpu-person-select.js', 'src/vpu-person-select-demo.js'] : glob.sync('test/**/*.js'), + input: (build != 'test') ? ['src/dbp-person-select.js', 'src/dbp-person-select-demo.js'] : glob.sync('test/**/*.js'), output: { dir: 'dist', entryFileNames: '[name].js', @@ -50,7 +50,7 @@ export default { copy({ targets: [ {src: 'assets/index.html', dest: 'dist'}, - {src: 'node_modules/vpu-common/assets/icons/*.svg', dest: 'dist/local/vpu-common/icons'}, + {src: 'node_modules/dbp-common/assets/icons/*.svg', dest: 'dist/local/dbp-common/icons'}, ], }), (process.env.ROLLUP_WATCH === 'true') ? serve({contentBase: 'dist', host: '127.0.0.1', port: 8002}) : false diff --git a/packages/person-select/src/vpu-person-select-demo.js b/packages/person-select/src/dbp-person-select-demo.js similarity index 73% rename from packages/person-select/src/vpu-person-select-demo.js rename to packages/person-select/src/dbp-person-select-demo.js index 76878791..ba59e9b5 100644 --- a/packages/person-select/src/vpu-person-select-demo.js +++ b/packages/person-select/src/dbp-person-select-demo.js @@ -2,9 +2,9 @@ import {i18n} from './i18n.js'; import {css, html, LitElement} from 'lit-element'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import {PersonSelect} from './person-select.js'; -import {AuthKeycloak, LoginButton} from 'vpu-auth'; -import * as commonUtils from 'vpu-common/utils'; -import * as commonStyles from 'vpu-common/styles'; +import {AuthKeycloak, LoginButton} from 'dbp-auth'; +import * as commonUtils from 'dbp-common/utils'; +import * as commonStyles from 'dbp-common/styles'; class PersonSelectDemo extends ScopedElementsMixin(LitElement) { constructor() { @@ -15,9 +15,9 @@ class PersonSelectDemo extends ScopedElementsMixin(LitElement) { static get scopedElements() { return { - 'vpu-auth-keycloak': AuthKeycloak, - 'vpu-login-button': LoginButton, - 'vpu-person-select': PersonSelect, + 'dbp-auth-keycloak': AuthKeycloak, + 'dbp-login-button': LoginButton, + 'dbp-person-select': PersonSelect, }; } @@ -51,8 +51,8 @@ class PersonSelectDemo extends ScopedElementsMixin(LitElement) { getAuthComponentHtml() { return this.noAuth ? html`` : html` <div class="container"> - <vpu-auth-keycloak lang="${this.lang}" url="https://auth-dev.tugraz.at/auth" realm="tugraz" client-id="auth-dev-mw-frontend-local" load-person try-login></vpu-auth-keycloak> - <vpu-login-button lang="${this.lang}" show-image></vpu-login-button> + <dbp-auth-keycloak lang="${this.lang}" url="https://auth-dev.tugraz.at/auth" realm="tugraz" client-id="auth-dev-mw-frontend-local" load-person try-login></dbp-auth-keycloak> + <dbp-login-button lang="${this.lang}" show-image></dbp-login-button> </div> `; } @@ -69,13 +69,13 @@ class PersonSelectDemo extends ScopedElementsMixin(LitElement) { <div class="field"> <label class="label">Person 1</label> <div class="control"> - <vpu-person-select lang="${this.lang}" entry-point-url="${commonUtils.getAPiUrl()}"></vpu-person-select> + <dbp-person-select lang="${this.lang}" entry-point-url="${commonUtils.getAPiUrl()}"></dbp-person-select> </div> </div> <div class="field"> <label class="label">Person 2</label> <div class="control"> - <vpu-person-select lang="${this.lang}" entry-point-url="${commonUtils.getAPiUrl()}" show-reload-button reload-button-title="Click me"></vpu-person-select> + <dbp-person-select lang="${this.lang}" entry-point-url="${commonUtils.getAPiUrl()}" show-reload-button reload-button-title="Click me"></dbp-person-select> </div> </div> </form> @@ -85,4 +85,4 @@ class PersonSelectDemo extends ScopedElementsMixin(LitElement) { } } -commonUtils.defineCustomElement('vpu-person-select-demo', PersonSelectDemo); +commonUtils.defineCustomElement('dbp-person-select-demo', PersonSelectDemo); diff --git a/packages/person-select/src/dbp-person-select.js b/packages/person-select/src/dbp-person-select.js new file mode 100644 index 00000000..8f18f93d --- /dev/null +++ b/packages/person-select/src/dbp-person-select.js @@ -0,0 +1,4 @@ +import * as commonUtils from 'dbp-common/utils'; +import {PersonSelect} from './person-select.js'; + +commonUtils.defineCustomElement('dbp-person-select', PersonSelect); diff --git a/packages/person-select/src/demo.js b/packages/person-select/src/demo.js index 57828ac3..a1f48b5e 100644 --- a/packages/person-select/src/demo.js +++ b/packages/person-select/src/demo.js @@ -1 +1 @@ -import './vpu-person-select-demo.js'; +import './dbp-person-select-demo.js'; diff --git a/packages/person-select/src/i18n.js b/packages/person-select/src/i18n.js index 02c88eb4..3fb3a1af 100644 --- a/packages/person-select/src/i18n.js +++ b/packages/person-select/src/i18n.js @@ -1,4 +1,4 @@ -import {createInstance} from 'vpu-common/i18next.js'; +import {createInstance} from 'dbp-common/i18next.js'; import de from './i18n/de/translation.json'; import en from './i18n/en/translation.json'; diff --git a/packages/person-select/src/person-select.js b/packages/person-select/src/person-select.js index c2a74dec..05abc17d 100644 --- a/packages/person-select/src/person-select.js +++ b/packages/person-select/src/person-select.js @@ -3,15 +3,15 @@ import {findObjectInApiResults} from './utils.js'; import select2 from 'select2'; import select2LangDe from './i18n/de/select2' import select2LangEn from './i18n/en/select2' -import JSONLD from 'vpu-common/jsonld'; +import JSONLD from 'dbp-common/jsonld'; import {css, html, LitElement} from 'lit-element'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import {i18n} from './i18n.js'; -import {Icon} from 'vpu-common'; -import * as commonUtils from 'vpu-common/utils'; -import * as commonStyles from 'vpu-common/styles'; +import {Icon} from 'dbp-common'; +import * as commonUtils from 'dbp-common/utils'; +import * as commonStyles from 'dbp-common/styles'; import select2CSSPath from 'select2/dist/css/select2.min.css'; -import * as errorUtils from "vpu-common/error"; +import * as errorUtils from "dbp-common/error"; const personContext = { @@ -45,7 +45,7 @@ export class PersonSelect extends ScopedElementsMixin(LitElement) { static get scopedElements() { return { - 'vpu-icon': Icon, + 'dbp-icon': Icon, }; } @@ -146,7 +146,7 @@ export class PersonSelect extends ScopedElementsMixin(LitElement) { url: apiUrl, contentType: "application/ld+json", beforeSend: function (jqXHR) { - jqXHR.setRequestHeader('Authorization', 'Bearer ' + window.VPUAuthToken); + jqXHR.setRequestHeader('Authorization', 'Bearer ' + window.DBPAuthToken); that.isSearching = true; }, data: function (params) { @@ -209,7 +209,7 @@ export class PersonSelect extends ScopedElementsMixin(LitElement) { fetch(apiUrl, { headers: { 'Content-Type': 'application/ld+json', - 'Authorization': 'Bearer ' + window.VPUAuthToken, + 'Authorization': 'Bearer ' + window.DBPAuthToken, }, }) .then(result => { @@ -317,12 +317,12 @@ export class PersonSelect extends ScopedElementsMixin(LitElement) { align-items: center; justify-content: center; border: 1px solid #aaa; - -moz-border-radius-topright: var(--vpu-border-radius); - -moz-border-radius-bottomright: var(--vpu-border-radius); + -moz-border-radius-topright: var(--dbp-border-radius); + -moz-border-radius-bottomright: var(--dbp-border-radius); line-height: 100%; } - .field .button.control vpu-icon { + .field .button.control dbp-icon { top: 0; } ` @@ -351,7 +351,7 @@ export class PersonSelect extends ScopedElementsMixin(LitElement) { @click="${this.reloadClick}" style="display: ${this.showReloadButton ? "flex" : "none"}" title="${this.reloadButtonTitle}"> - <vpu-icon name="reload"></vpu-icon> + <dbp-icon name="reload"></dbp-icon> </a> </div> <div id="person-select-dropdown"></div> diff --git a/packages/person-select/src/vpu-person-select.js b/packages/person-select/src/vpu-person-select.js deleted file mode 100644 index a343963d..00000000 --- a/packages/person-select/src/vpu-person-select.js +++ /dev/null @@ -1,4 +0,0 @@ -import * as commonUtils from 'vpu-common/utils'; -import {PersonSelect} from './person-select.js'; - -commonUtils.defineCustomElement('vpu-person-select', PersonSelect); diff --git a/packages/person-select/test/unit.js b/packages/person-select/test/unit.js index d09cf476..ce021395 100644 --- a/packages/person-select/test/unit.js +++ b/packages/person-select/test/unit.js @@ -1,11 +1,11 @@ -import '../src/vpu-person-select.js'; +import '../src/dbp-person-select.js'; import '../src/demo.js'; -describe('vpu-person-select basics', () => { +describe('dbp-person-select basics', () => { let node; beforeEach(async () => { - node = document.createElement('vpu-person-select'); + node = document.createElement('dbp-person-select'); document.body.appendChild(node); await node.updateComplete; }); @@ -19,11 +19,11 @@ describe('vpu-person-select basics', () => { }); }); -describe('vpu-person-select-demo basics', () => { +describe('dbp-person-select-demo basics', () => { let node; beforeEach(async () => { - node = document.createElement('vpu-person-select-demo'); + node = document.createElement('dbp-person-select-demo'); document.body.appendChild(node); await node.updateComplete; }); -- GitLab