From 4bd9c0efdd3d945790af8d3ecd992f2a2e94cac8 Mon Sep 17 00:00:00 2001 From: Christoph Reiter <reiter.christoph@gmail.com> Date: Tue, 2 Aug 2022 11:23:34 +0200 Subject: [PATCH] Move to @tugraz packages for tugraz specific code --- assets/dbp-signature.html.ejs | 4 +++- package.json | 3 ++- rollup.config.js | 2 +- src/dbp-signature.js | 4 ++-- yarn.lock | 15 +++++++++++++++ 5 files changed, 23 insertions(+), 5 deletions(-) diff --git a/assets/dbp-signature.html.ejs b/assets/dbp-signature.html.ejs index fbe49a2..dbfe10e 100644 --- a/assets/dbp-signature.html.ejs +++ b/assets/dbp-signature.html.ejs @@ -133,7 +133,9 @@ padding: 0 50px 0 0; } </style> - <dbp-tugraz-logo id="main-logo" subscribe="lang"></dbp-tugraz-logo> + <a href="https://www.tugraz.at" title="TU Graz Home" target="_blank" rel="noopener"> + <tug-logo id="main-logo" subscribe="lang"></tug-logo> + </a> </div> <div slot="footer-links"> <style> diff --git a/package.json b/package.json index d86f5f8..34b6fcf 100644 --- a/package.json +++ b/package.json @@ -48,13 +48,14 @@ "@dbp-toolkit/auth": "^0.3.0", "@dbp-toolkit/common": "^0.3.0", "@dbp-toolkit/file-handling": "^0.3.0", - "@dbp-toolkit/font-source-sans-pro": "^0.2.0", "@dbp-toolkit/language-select": "^0.3.0", "@dbp-toolkit/notification": "^0.3.0", "@dbp-toolkit/person-profile": "^0.2.0", "@dbp-toolkit/resource-select": "^0.1.0", "@digital-blueprint/annotpdf": "^1.0.13-a", "@open-wc/scoped-elements": "^2.1.0", + "@tugraz/font-source-sans-pro": "^0.2.4", + "@tugraz/web-components": "^0.3.6", "@webcomponents/scoped-custom-element-registry": "^0.0.5", "fabric": "^5.0.0", "file-saver": "^2.0.2", diff --git a/rollup.config.js b/rollup.config.js index 141dbb2..6da3d8b 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -225,7 +225,7 @@ Dependencies: dest: 'dist/' + (await getDistPath(pkg.name, 'pdfjs')), }, // do we want all map files? { - src: await getPackagePath('@dbp-toolkit/font-source-sans-pro', 'files/*'), + src: await getPackagePath('@tugraz/font-source-sans-pro', 'files/*'), dest: 'dist/' + (await getDistPath(pkg.name, 'fonts/source-sans-pro')), }, { diff --git a/src/dbp-signature.js b/src/dbp-signature.js index d953351..3580633 100644 --- a/src/dbp-signature.js +++ b/src/dbp-signature.js @@ -2,8 +2,8 @@ import '@webcomponents/scoped-custom-element-registry'; import {AppShell} from '@dbp-toolkit/app-shell'; import * as commonUtils from '@dbp-toolkit/common/utils'; import {Translated} from '@dbp-toolkit/common/src/translated'; -import {TUGrazLogo} from '@dbp-toolkit/app-shell/src/tugraz-logo'; +import {Logo} from '@tugraz/web-components'; commonUtils.defineCustomElement('dbp-signature', AppShell); commonUtils.defineCustomElement('dbp-translated', Translated); -commonUtils.defineCustomElement('dbp-tugraz-logo', TUGrazLogo); +commonUtils.defineCustomElement('tug-logo', Logo); diff --git a/yarn.lock b/yarn.lock index be6ac04..0acba47 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1237,6 +1237,21 @@ resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== +"@tugraz/font-source-sans-pro@^0.2.4": + version "0.2.4" + resolved "https://registry.yarnpkg.com/@tugraz/font-source-sans-pro/-/font-source-sans-pro-0.2.4.tgz#896ab2b381d389ff7597b9528dd9fd95f97ef13e" + integrity sha512-PqYTTtb3/Wu3zVFLYvuu1nEjfeAjvLSnknSfA5gv153WXmXtSVLOTmvPiiy3ZRERBoUv33jL7VwK5QcDRI3V8g== + +"@tugraz/web-components@^0.3.6": + version "0.3.6" + resolved "https://registry.yarnpkg.com/@tugraz/web-components/-/web-components-0.3.6.tgz#884299230332ed0b584fe05ed57c98d79af2260f" + integrity sha512-yCmVI21trViZaJnvyIydXv8cxf6OaYiopWKwEwpCaBGHjvoVQGXV9f2YILDAmsG3QFelup9qyjYluQ48TLWeFw== + dependencies: + "@dbp-toolkit/common" "^0.3.4" + "@open-wc/scoped-elements" "^2.1.0" + i18next "^21.4.2" + lit "^2.0.0" + "@types/chai@^4.2.12": version "4.3.0" resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.0.tgz#23509ebc1fa32f1b4d50d6a66c4032d5b8eaabdc" -- GitLab