From 361d854cc44a68882ec2bdedeeef05603dca7442 Mon Sep 17 00:00:00 2001
From: Patrizio Bekerle <patrizio.bekerle@tugraz.at>
Date: Tue, 14 Jul 2020 15:07:41 +0200
Subject: [PATCH] Refactoring vpu to dbp (dbp/web-components/toolkit#2)
---
.gitlab-ci.yml | 4 +-
.gitlab-ci/README.md | 2 +-
.gitlab-ci/build.sh | 2 +-
README.md | 8 +-
...ficial-signature-pdf-upload.metadata.json} | 4 +-
...lified-signature-pdf-upload.metadata.json} | 4 +-
... dbp-signature-verification.metadata.json} | 4 +-
...nature.html.ejs => dbp-signature.html.ejs} | 18 ++--
... => dbp-signature.topic.metadata.json.ejs} | 6 +-
assets/manifest.json | 6 +-
package-lock.json | 16 ++--
package.json | 18 ++--
rollup.config.js | 16 ++--
...s => dbp-official-signature-pdf-upload.js} | 86 +++++++++---------
...{vpu-pdf-preview.js => dbp-pdf-preview.js} | 32 +++----
... => dbp-qualified-signature-pdf-upload.js} | 90 +++++++++----------
...lement.js => dbp-signature-lit-element.js} | 14 +--
...ation.js => dbp-signature-verification.js} | 64 ++++++-------
src/dbp-signature.js | 4 +
src/i18n.js | 2 +-
src/textswitch.js | 6 +-
src/vpu-signature.js | 4 -
test/unit.js | 12 +--
vendor/toolkit | 2 +-
24 files changed, 212 insertions(+), 212 deletions(-)
rename assets/{vpu-official-signature-pdf-upload.metadata.json => dbp-official-signature-pdf-upload.metadata.json} (79%)
rename assets/{vpu-qualified-signature-pdf-upload.metadata.json => dbp-qualified-signature-pdf-upload.metadata.json} (80%)
rename assets/{vpu-signature-verification.metadata.json => dbp-signature-verification.metadata.json} (81%)
rename assets/{vpu-signature.html.ejs => dbp-signature.html.ejs} (91%)
rename assets/{vpu-signature.topic.metadata.json.ejs => dbp-signature.topic.metadata.json.ejs} (76%)
rename src/{vpu-official-signature-pdf-upload.js => dbp-official-signature-pdf-upload.js} (93%)
rename src/{vpu-pdf-preview.js => dbp-pdf-preview.js} (95%)
rename src/{vpu-qualified-signature-pdf-upload.js => dbp-qualified-signature-pdf-upload.js} (93%)
rename src/{vpu-signature-lit-element.js => dbp-signature-lit-element.js} (91%)
rename src/{vpu-signature-verification.js => dbp-signature-verification.js} (94%)
create mode 100644 src/dbp-signature.js
delete mode 100644 src/vpu-signature.js
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5d9bc62..293277d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
-image: registry.gitlab.tugraz.at/vpu/apps/signature/main:v2
+image: registry.gitlab.tugraz.at/dbp/apps/signature/main:v2
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
stages:
diff --git a/.gitlab-ci/README.md b/.gitlab-ci/README.md
index 94ad77b..2cd6fcf 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/apps/signature/main:v1
\ No newline at end of file
+* sudo docker push registry.gitlab.tugraz.at/dbp/apps/signature/main:v1
\ No newline at end of file
diff --git a/.gitlab-ci/build.sh b/.gitlab-ci/build.sh
index a602fc3..236b3ba 100755
--- a/.gitlab-ci/build.sh
+++ b/.gitlab-ci/build.sh
@@ -1,7 +1,7 @@
#!/bin/bash
set -e
-TAG="registry.gitlab.tugraz.at/vpu/apps/signature/main:v2"
+TAG="registry.gitlab.tugraz.at/dbp/apps/signature/main:v2"
sudo docker build --tag "${TAG}" --file "Dockerfile" .
sudo docker run --rm --security-opt label=disable \
--volume "$(pwd)/..:/home/user/app" --workdir "/home/user/app" \
diff --git a/README.md b/README.md
index 768bc75..f763b67 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,12 @@
# Digital Signing Application
-[GitLab Repository](https://gitlab.tugraz.at/VPU/Apps/Signature)
+[GitLab Repository](https://gitlab.tugraz.at/dbp/apps/Signature)
## Local development
```bash
# get the source
-git clone git@gitlab.tugraz.at:VPU/Apps/Signature.git
+git clone git@gitlab.tugraz.at:dbp/apps/Signature.git
cd Signature
git submodule update --init
@@ -26,8 +26,8 @@ npm test
Jump to <http://localhost:8001> and you should get a Single Sign On login page.
To use the Nextcloud functionality you need a running Nextcloud server with the
-[webapppassword](https://gitlab.tugraz.at/VPU/Middleware/Nextcloud/webapppassword) Nextcloud app like this
-[Nextcloud Development Environment](https://gitlab.tugraz.at/VPU/Middleware/Nextcloud/webapppassword/-/tree/master/docker).
+[webapppassword](https://gitlab.tugraz.at/DBP/Middleware/Nextcloud/webapppassword) Nextcloud app like this
+[Nextcloud Development Environment](https://gitlab.tugraz.at/DBP/Middleware/Nextcloud/webapppassword/-/tree/master/docker).
## Browser versions
diff --git a/assets/vpu-official-signature-pdf-upload.metadata.json b/assets/dbp-official-signature-pdf-upload.metadata.json
similarity index 79%
rename from assets/vpu-official-signature-pdf-upload.metadata.json
rename to assets/dbp-official-signature-pdf-upload.metadata.json
index 83b775f..4c8a119 100644
--- a/assets/vpu-official-signature-pdf-upload.metadata.json
+++ b/assets/dbp-official-signature-pdf-upload.metadata.json
@@ -1,6 +1,6 @@
{
- "element": "vpu-official-signature-pdf-upload",
- "module_src": "vpu-official-signature-pdf-upload.js",
+ "element": "dbp-official-signature-pdf-upload",
+ "module_src": "dbp-official-signature-pdf-upload.js",
"routing_name": "official-pdf-upload",
"name": {
"de": "Dokumente amtssignieren",
diff --git a/assets/vpu-qualified-signature-pdf-upload.metadata.json b/assets/dbp-qualified-signature-pdf-upload.metadata.json
similarity index 80%
rename from assets/vpu-qualified-signature-pdf-upload.metadata.json
rename to assets/dbp-qualified-signature-pdf-upload.metadata.json
index be62470..5063ecd 100644
--- a/assets/vpu-qualified-signature-pdf-upload.metadata.json
+++ b/assets/dbp-qualified-signature-pdf-upload.metadata.json
@@ -1,6 +1,6 @@
{
- "element": "vpu-qualified-signature-pdf-upload",
- "module_src": "vpu-qualified-signature-pdf-upload.js",
+ "element": "dbp-qualified-signature-pdf-upload",
+ "module_src": "dbp-qualified-signature-pdf-upload.js",
"routing_name": "qualified-pdf-upload",
"name": {
"de": "Dokument persönlich signieren",
diff --git a/assets/vpu-signature-verification.metadata.json b/assets/dbp-signature-verification.metadata.json
similarity index 81%
rename from assets/vpu-signature-verification.metadata.json
rename to assets/dbp-signature-verification.metadata.json
index 3c4ac9a..cc727c3 100644
--- a/assets/vpu-signature-verification.metadata.json
+++ b/assets/dbp-signature-verification.metadata.json
@@ -1,6 +1,6 @@
{
- "element": "vpu-signature-verification",
- "module_src": "vpu-signature-verification.js",
+ "element": "dbp-signature-verification",
+ "module_src": "dbp-signature-verification.js",
"routing_name": "signature-verification",
"name": {
"de": "Signierte Dokumente verifizieren",
diff --git a/assets/vpu-signature.html.ejs b/assets/dbp-signature.html.ejs
similarity index 91%
rename from assets/vpu-signature.html.ejs
rename to assets/dbp-signature.html.ejs
index eaaf1ee..108c34a 100644
--- a/assets/vpu-signature.html.ejs
+++ b/assets/dbp-signature.html.ejs
@@ -21,7 +21,7 @@
<!-- Loading spinner -->
<script type="module">
import {Spinner} from '<%= getPrivateUrl('spinner.js') %>';
- customElements.define('vpu-loading-spinner', Spinner);
+ customElements.define('dbp-loading-spinner', Spinner);
</script>
<!-- App bundles-->
@@ -112,13 +112,13 @@
/* TU-Graz style override */
html {
- --vpu-override-primary-bg-color: #245b78;
- --vpu-override-primary-button-border: solid 1px #245b78;
- --vpu-override-info-bg-color: #245b78;
- --vpu-override-danger-bg-color: #e4154b;
- --vpu-override-warning-bg-color: #ffe183;
- --vpu-override-warning-text-color: black;
- --vpu-override-success-bg-color: #259207;
+ --dbp-override-primary-bg-color: #245b78;
+ --dbp-override-primary-button-border: solid 1px #245b78;
+ --dbp-override-info-bg-color: #245b78;
+ --dbp-override-danger-bg-color: #e4154b;
+ --dbp-override-warning-bg-color: #ffe183;
+ --dbp-override-warning-text-color: black;
+ --dbp-override-success-bg-color: #259207;
}
</style>
@@ -134,7 +134,7 @@
entry-point-url="<%= entryPointURL %>"
base-path="<%= getUrl('') %>"
keycloak-config='{"url": "<%= keyCloakBaseURL %>", "realm": "tugraz", "clientId": "<%= keyCloakClientId %>", "silentCheckSsoRedirectUri": "<%= getUrl('silent-check-sso.html') %>"}'
-><vpu-loading-spinner></vpu-loading-spinner></<%= name %>>
+><dbp-loading-spinner></dbp-loading-spinner></<%= name %>>
<!-- Error handling for too old browsers -->
<script src="<%= getPrivateUrl('browser-check.js') %>" defer></script>
diff --git a/assets/vpu-signature.topic.metadata.json.ejs b/assets/dbp-signature.topic.metadata.json.ejs
similarity index 76%
rename from assets/vpu-signature.topic.metadata.json.ejs
rename to assets/dbp-signature.topic.metadata.json.ejs
index 2a2be86..facd50e 100644
--- a/assets/vpu-signature.topic.metadata.json.ejs
+++ b/assets/dbp-signature.topic.metadata.json.ejs
@@ -13,10 +13,10 @@
},
"routing_name": "signature",
"activities": [
- {"path": "vpu-official-signature-pdf-upload.metadata.json",
+ {"path": "dbp-official-signature-pdf-upload.metadata.json",
"visible": <%= environment == "local" || environment == "development" || environment == "demo" %>},
- {"path": "vpu-qualified-signature-pdf-upload.metadata.json"},
- {"path": "vpu-signature-verification.metadata.json",
+ {"path": "dbp-qualified-signature-pdf-upload.metadata.json"},
+ {"path": "dbp-signature-verification.metadata.json",
"visible": <%= environment == "local" || environment == "development" %>}
],
"attributes": []
diff --git a/assets/manifest.json b/assets/manifest.json
index 03f9e77..1054d27 100644
--- a/assets/manifest.json
+++ b/assets/manifest.json
@@ -1,15 +1,15 @@
{
"short_name": "Signature",
"name": "TUGraz Signature",
- "start_url": "./vpu-signature.html",
+ "start_url": "./dbp-signature.html",
"icons": [
{
- "src": "local/vpu-signature/icon-192.png",
+ "src": "local/dbp-signature/icon-192.png",
"type": "image/png",
"sizes": "192x192"
},
{
- "src": "local/vpu-signature/icon-512.png",
+ "src": "local/dbp-signature/icon-512.png",
"type": "image/png",
"sizes": "512x512"
}
diff --git a/package-lock.json b/package-lock.json
index 038c542..882d4a8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,5 +1,5 @@
{
- "name": "vpu-signature",
+ "name": "dbp-signature",
"version": "1.0.0",
"lockfileVersion": 1,
"requires": true,
@@ -8348,7 +8348,7 @@
"integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=",
"dev": true
},
- "vpu-app-shell": {
+ "dbp-app-shell": {
"version": "file:vendor/toolkit/packages/app-shell",
"requires": {
"@open-wc/scoped-elements": "^1.1.1",
@@ -8358,7 +8358,7 @@
"universal-router": "^9.0.1"
}
},
- "vpu-auth": {
+ "dbp-auth": {
"version": "file:vendor/toolkit/packages/auth",
"requires": {
"@open-wc/scoped-elements": "^1.1.1",
@@ -8367,7 +8367,7 @@
"lit-element": "^2.3.1"
}
},
- "vpu-common": {
+ "dbp-common": {
"version": "file:vendor/toolkit/packages/common",
"requires": {
"@open-wc/scoped-elements": "^1.1.1",
@@ -8376,7 +8376,7 @@
"lit-element": "^2.3.1"
}
},
- "vpu-file-handling": {
+ "dbp-file-handling": {
"version": "file:vendor/toolkit/packages/file-handling",
"requires": {
"@open-wc/scoped-elements": "^1.0.8",
@@ -8390,21 +8390,21 @@
"webdav": "^3.3.0"
}
},
- "vpu-language-select": {
+ "dbp-language-select": {
"version": "file:vendor/toolkit/packages/language-select",
"requires": {
"@open-wc/scoped-elements": "^1.1.1",
"lit-element": "^2.3.1"
}
},
- "vpu-notification": {
+ "dbp-notification": {
"version": "file:vendor/toolkit/packages/notification",
"requires": {
"@open-wc/scoped-elements": "^1.1.1",
"lit-element": "^2.3.1"
}
},
- "vpu-person-profile": {
+ "dbp-person-profile": {
"version": "file:vendor/toolkit/packages/person-profile",
"requires": {
"@open-wc/scoped-elements": "^1.1.1",
diff --git a/package.json b/package.json
index 8ae0345..b4ab7fc 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
- "name": "vpu-signature",
+ "name": "dbp-signature",
"version": "1.0.0",
- "main": "src/vpu-signature.js",
+ "main": "src/dbp-signature.js",
"license": "LGPL-2.1-or-later",
"devDependencies": {
"@babel/core": "^7.10.3",
@@ -52,13 +52,13 @@
"source-sans-pro": "^2.45.0",
"tabulator-tables": "^4.7.0",
"universal-router": "^9.0.1",
- "vpu-app-shell": "file:./vendor/toolkit/packages/app-shell",
- "vpu-auth": "file:./vendor/toolkit/packages/auth",
- "vpu-common": "file:./vendor/toolkit/packages/common",
- "vpu-file-handling": "file:./vendor/toolkit/packages/file-handling",
- "vpu-language-select": "file:./vendor/toolkit/packages/language-select",
- "vpu-notification": "file:./vendor/toolkit/packages/notification",
- "vpu-person-profile": "file:./vendor/toolkit/packages/person-profile",
+ "dbp-app-shell": "file:./vendor/toolkit/packages/app-shell",
+ "dbp-auth": "file:./vendor/toolkit/packages/auth",
+ "dbp-common": "file:./vendor/toolkit/packages/common",
+ "dbp-file-handling": "file:./vendor/toolkit/packages/file-handling",
+ "dbp-language-select": "file:./vendor/toolkit/packages/language-select",
+ "dbp-notification": "file:./vendor/toolkit/packages/notification",
+ "dbp-person-profile": "file:./vendor/toolkit/packages/person-profile",
"webdav": "^3.3.0"
},
"scripts": {
diff --git a/rollup.config.js b/rollup.config.js
index 286f548..6aa6db2 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -107,7 +107,7 @@ function generateTLSConfig() {
fs.mkdirSync('.cert', {recursive: true});
if (!fs.existsSync('.cert/server.key') || !fs.existsSync('.cert/server.cert')) {
- const attrs = [{name: 'commonName', value: 'vpu-dev.localhost'}];
+ const attrs = [{name: 'commonName', value: 'dbp-dev.localhost'}];
const pems = selfsigned.generate(attrs, {algorithm: 'sha256', days: 9999});
fs.writeFileSync('.cert/server.key', pems.private);
fs.writeFileSync('.cert/server.cert', pems.cert);
@@ -146,9 +146,9 @@ function getBuildInfo() {
export default {
input: (build != 'test') ? [
'src/' + pkg.name + '.js',
- 'src/vpu-official-signature-pdf-upload.js',
- 'src/vpu-qualified-signature-pdf-upload.js',
- 'src/vpu-signature-verification.js',
+ 'src/dbp-official-signature-pdf-upload.js',
+ 'src/dbp-qualified-signature-pdf-upload.js',
+ 'src/dbp-signature-verification.js',
] : glob.sync('test/**/*.js'),
output: {
dir: 'dist',
@@ -270,14 +270,14 @@ Dependencies:
},
{src: 'node_modules/pdfjs-dist/cmaps/*', dest: 'dist/local/' + pkg.name + '/pdfjs'}, // do we want all map files?
{src: 'node_modules/source-sans-pro/WOFF2/OTF/*', dest: 'dist/local/' + pkg.name + '/fonts'},
- {src: 'node_modules/vpu-common/src/spinner.js', dest: 'dist/local/' + pkg.name, rename: 'spinner.js'},
- {src: 'node_modules/vpu-common/misc/browser-check.js', dest: 'dist/local/' + pkg.name, rename: 'browser-check.js'},
+ {src: 'node_modules/dbp-common/src/spinner.js', dest: 'dist/local/' + pkg.name, rename: 'spinner.js'},
+ {src: 'node_modules/dbp-common/misc/browser-check.js', dest: 'dist/local/' + pkg.name, rename: 'browser-check.js'},
{src: 'assets/icon-*.png', dest: 'dist/local/' + pkg.name},
{src: 'assets/*-placeholder.png', dest: 'dist/local/' + pkg.name},
{src: 'assets/manifest.json', dest: 'dist', rename: pkg.name + '.manifest.json'},
{src: 'assets/*.metadata.json', dest: 'dist'},
- {src: 'node_modules/vpu-common/assets/icons/*.svg', dest: 'dist/local/vpu-common/icons'},
- {src: 'node_modules/tabulator-tables/dist/css', dest: 'dist/local/vpu-file-source/tabulator-tables'},
+ {src: 'node_modules/dbp-common/assets/icons/*.svg', dest: 'dist/local/dbp-common/icons'},
+ {src: 'node_modules/tabulator-tables/dist/css', dest: 'dist/local/dbp-file-source/tabulator-tables'},
],
}),
useBabel && babel({
diff --git a/src/vpu-official-signature-pdf-upload.js b/src/dbp-official-signature-pdf-upload.js
similarity index 93%
rename from src/vpu-official-signature-pdf-upload.js
rename to src/dbp-official-signature-pdf-upload.js
index 6c389c3..fc99a73 100644
--- a/src/vpu-official-signature-pdf-upload.js
+++ b/src/dbp-official-signature-pdf-upload.js
@@ -1,25 +1,25 @@
import {createI18nInstance} from './i18n.js';
-import {humanFileSize} from 'vpu-common/i18next.js';
+import {humanFileSize} from 'dbp-common/i18next.js';
import {css, html} from 'lit-element';
import {ScopedElementsMixin} from '@open-wc/scoped-elements';
-import VPUSignatureLitElement from "./vpu-signature-lit-element";
-import {PdfPreview} from "./vpu-pdf-preview";
-import * as commonUtils from 'vpu-common/utils';
+import DBPSignatureLitElement from "./dbp-signature-lit-element";
+import {PdfPreview} from "./dbp-pdf-preview";
+import * as commonUtils from 'dbp-common/utils';
import * as utils from './utils';
-import {Button, Icon, MiniSpinner} from 'vpu-common';
-import * as commonStyles from 'vpu-common/styles';
+import {Button, Icon, MiniSpinner} from 'dbp-common';
+import * as commonStyles from 'dbp-common/styles';
import {classMap} from 'lit-html/directives/class-map.js';
-import {FileSource} from 'vpu-file-handling';
-import JSONLD from "vpu-common/jsonld";
+import {FileSource} from 'dbp-file-handling';
+import JSONLD from "dbp-common/jsonld";
import {TextSwitch} from './textswitch.js';
import nextcloudWebAppPasswordURL from 'consts:nextcloudWebAppPasswordURL';
import nextcloudWebDavURL from 'consts:nextcloudWebDavURL';
-import {FileSink} from "vpu-file-handling";
+import {FileSink} from "dbp-file-handling";
import FileSaver from 'file-saver';
const i18n = createI18nInstance();
-class OfficialSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitElement) {
+class OfficialSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitElement) {
constructor() {
super();
this.lang = i18n.language;
@@ -45,13 +45,13 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitElem
static get scopedElements() {
return {
- 'vpu-icon': Icon,
- 'vpu-file-source': FileSource,
- 'vpu-file-sink': FileSink,
- 'vpu-pdf-preview': PdfPreview,
- 'vpu-mini-spinner': MiniSpinner,
- 'vpu-button': Button,
- 'vpu-textswitch': TextSwitch,
+ 'dbp-icon': Icon,
+ 'dbp-file-source': FileSource,
+ 'dbp-file-sink': FileSink,
+ 'dbp-pdf-preview': PdfPreview,
+ 'dbp-mini-spinner': MiniSpinner,
+ 'dbp-button': Button,
+ 'dbp-textswitch': TextSwitch,
};
}
@@ -316,7 +316,7 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitElem
// start signature placement process
this.signaturePlacementInProgress = true;
this.withSigBlock = withSigBlock;
- const previewTag = this.constructor.getScopedTagName("vpu-pdf-preview");
+ const previewTag = this.constructor.getScopedTagName("dbp-pdf-preview");
await this._(previewTag).showPDF(
file,
withSigBlock, //this.queuedFilesPlacementModes[key] === "manual",
@@ -415,7 +415,7 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitElem
font-weight: 600;
}
- .notification vpu-mini-spinner {
+ .notification dbp-mini-spinner {
position: relative;
top: 2px;
margin-right: 5px;
@@ -429,7 +429,7 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitElem
color: white;
}
- /* using vpu-icon doesn't work */
+ /* using dbp-icon doesn't work */
button > [name=close], a > [name=close] {
font-size: 0.8em;
}
@@ -602,7 +602,7 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitElem
?disabled="${this.signingProcessEnabled}"
title="${i18n.t('official-pdf-upload.remove-queued-file-button-title')}"
@click="${() => { this.takeFileFromQueue(id); }}">
- <vpu-icon name="trash"></vpu-icon></button>
+ <dbp-icon name="trash"></dbp-icon></button>
</div>
<div class="bottom-line">
<div></div>
@@ -610,14 +610,14 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitElem
?disabled="${this.signingProcessEnabled}"
@click="${() => { this.showPreview(id); }}">${i18n.t('official-pdf-upload.show-preview')}</button>
<span class="headline">${i18n.t('official-pdf-upload.positioning')}:</span>
- <vpu-textswitch name1="auto"
+ <dbp-textswitch name1="auto"
name2="manual"
name="${this.queuedFilesPlacementModes[id] || "auto"}"
class="switch"
value1="${i18n.t('official-pdf-upload.positioning-automatic')}"
value2="${i18n.t('official-pdf-upload.positioning-manual')}"
?disabled="${this.signingProcessEnabled}"
- @change=${ (e) => this.queuePlacementSwitch(id, e.target.name) }></vpu-textswitch>
+ @change=${ (e) => this.queuePlacementSwitch(id, e.target.name) }></dbp-textswitch>
</div>
</div>
`);
@@ -645,7 +645,7 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitElem
<button class="button close"
title="${i18n.t('official-pdf-upload.download-file-button-title')}"
@click="${() => { this.fileDownloadClickHandler(file); }}">
- <vpu-icon name="download"></vpu-icon></button>
+ <dbp-icon name="download"></dbp-icon></button>
</div>
</div>
`);
@@ -673,11 +673,11 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitElem
<div class="buttons">
<button class="button"
title="${i18n.t('official-pdf-upload.re-upload-file-button-title')}"
- @click="${() => {this.fileQueueingClickHandler(data.file, id);}}"><vpu-icon name="reload"></vpu-icon></button>
+ @click="${() => {this.fileQueueingClickHandler(data.file, id);}}"><dbp-icon name="reload"></dbp-icon></button>
<button class="button"
title="${i18n.t('official-pdf-upload.remove-failed-file-button-title')}"
@click="${() => { this.takeFailedFileFromQueue(id); }}">
- <vpu-icon name="trash"></vpu-icon></button>
+ <dbp-icon name="trash"></dbp-icon></button>
</div>
</div>
<div class="bottom-line">
@@ -695,7 +695,7 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitElem
}
render() {
- const placeholderUrl = commonUtils.getAssetURL('local/vpu-signature/official-signature-placeholder.png');
+ const placeholderUrl = commonUtils.getAssetURL('local/dbp-signature/official-signature-placeholder.png');
return html`
<div class="${classMap({hidden: !this.isLoggedIn() || !this.hasSignaturePermissions() || this.isLoading()})}">
@@ -710,7 +710,7 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitElem
class="button is-primary">
${i18n.t('qualified-pdf-upload.upload-button-label')}
</button>
- <vpu-file-source
+ <dbp-file-source
id="file-source"
allowed-mime-types="application/pdf"
enabled-sources="local${this.showTestNextcloudFilePicker ? ",nextcloud" : ""}"
@@ -721,8 +721,8 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitElem
?disabled="${this.signingProcessActive}"
text="${i18n.t('official-pdf-upload.upload-area-text')}"
button-label="${i18n.t('official-pdf-upload.upload-button-label')}"
- @vpu-file-source-file-selected="${this.onFileSelected}"
- ></vpu-file-source>
+ @dbp-file-source-file-selected="${this.onFileSelected}"
+ ></dbp-file-source>
</div>
</div>
<div id="grid-container">
@@ -777,12 +777,12 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitElem
class="button">
${i18n.t('official-pdf-upload.clear-all')}
</button>
- <vpu-button id="zip-download-button"
+ <dbp-button id="zip-download-button"
value="${i18n.t('official-pdf-upload.download-zip-button')}"
title="${i18n.t('official-pdf-upload.download-zip-button-tooltip')}"
class="is-right"
@click="${this.zipDownloadClickHandler}"
- type="is-primary"></vpu-button>
+ type="is-primary"></dbp-button>
</div>
</div>
<div class="control">
@@ -799,13 +799,13 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitElem
class="button">
${i18n.t('official-pdf-upload.clear-all')}
</button>
- <vpu-button id="re-upload-all-button"
+ <dbp-button id="re-upload-all-button"
?disabled="${this.uploadInProgress}"
value="${i18n.t('official-pdf-upload.re-upload-all-button')}"
title="${i18n.t('official-pdf-upload.re-upload-all-button-title')}"
class="is-right"
@click="${this.reUploadAllClickHandler}"
- type="is-primary"></vpu-button>
+ type="is-primary"></dbp-button>
</div>
</div>
<div class="control">
@@ -822,18 +822,18 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitElem
<strong>${this.currentFile.name}</strong> (${humanFileSize(this.currentFile !== undefined ? this.currentFile.size : 0)})
</div>
<button class="button is-cancel"
- @click="${this.hidePDF}"><vpu-icon name="close"></vpu-icon></button>
+ @click="${this.hidePDF}"><dbp-icon name="close"></dbp-icon></button>
</div>
- <vpu-pdf-preview lang="${this.lang}"
+ <dbp-pdf-preview lang="${this.lang}"
signature-placeholder-image-src="${placeholderUrl}"
signature-width="145"
signature-height="45"
- @vpu-pdf-preview-accept="${this.storePDFData}"
- @vpu-pdf-preview-cancel="${this.hidePDF}"></vpu-pdf-preview>
+ @dbp-pdf-preview-accept="${this.storePDFData}"
+ @dbp-pdf-preview-cancel="${this.hidePDF}"></dbp-pdf-preview>
</div>
<!-- File upload progress -->
<div id="upload-progress" class="field notification is-info ${classMap({hidden: !this.uploadInProgress})}">
- <vpu-mini-spinner></vpu-mini-spinner>
+ <dbp-mini-spinner></dbp-mini-spinner>
<strong>${this.uploadStatusFileName}</strong>
${this.uploadStatusText}
</div>
@@ -847,17 +847,17 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitElem
${i18n.t('error-permission-message')}
</div>
<div class="${classMap({hidden: !this.isLoading()})}">
- <vpu-mini-spinner></vpu-mini-spinner>
+ <dbp-mini-spinner></dbp-mini-spinner>
</div>
- <vpu-file-sink id="file-sink"
+ <dbp-file-sink id="file-sink"
filename="signed-documents.zip"
enabled-destinations="local${this.showTestNextcloudFilePicker ? ",nextcloud" : ""}"
nextcloud-auth-url="${nextcloudWebAppPasswordURL}"
nextcloud-web-dav-url="${nextcloudWebDavURL}"
lang="${this.lang}"
- ></vpu-file-sink>
+ ></dbp-file-sink>
`;
}
}
-commonUtils.defineCustomElement('vpu-official-signature-pdf-upload', OfficialSignaturePdfUpload);
+commonUtils.defineCustomElement('dbp-official-signature-pdf-upload', OfficialSignaturePdfUpload);
diff --git a/src/vpu-pdf-preview.js b/src/dbp-pdf-preview.js
similarity index 95%
rename from src/vpu-pdf-preview.js
rename to src/dbp-pdf-preview.js
index de8b1f7..dc21e25 100644
--- a/src/vpu-pdf-preview.js
+++ b/src/dbp-pdf-preview.js
@@ -3,10 +3,10 @@ import {css, html} from 'lit-element';
import {classMap} from 'lit-html/directives/class-map.js';
import {live} from 'lit-html/directives/live.js';
import {ScopedElementsMixin} from '@open-wc/scoped-elements';
-import VPULitElement from 'vpu-common/vpu-lit-element';
-import {MiniSpinner, Icon} from 'vpu-common';
-import * as commonUtils from "vpu-common/utils";
-import * as commonStyles from 'vpu-common/styles';
+import DBPLitElement from 'dbp-common/dbp-lit-element';
+import {MiniSpinner, Icon} from 'dbp-common';
+import * as commonUtils from "dbp-common/utils";
+import * as commonStyles from 'dbp-common/styles';
import pdfjs from 'pdfjs-dist';
import buildinfo from 'consts:buildinfo';
@@ -15,7 +15,7 @@ const i18n = createI18nInstance();
/**
* PdfPreview web component
*/
-export class PdfPreview extends ScopedElementsMixin(VPULitElement) {
+export class PdfPreview extends ScopedElementsMixin(DBPLitElement) {
constructor() {
super();
this.lang = 'de';
@@ -40,8 +40,8 @@ export class PdfPreview extends ScopedElementsMixin(VPULitElement) {
static get scopedElements() {
return {
- 'vpu-mini-spinner': MiniSpinner,
- 'vpu-icon': Icon,
+ 'dbp-mini-spinner': MiniSpinner,
+ 'dbp-icon': Icon,
};
}
@@ -87,7 +87,7 @@ export class PdfPreview extends ScopedElementsMixin(VPULitElement) {
connectedCallback() {
super.connectedCallback();
const that = this;
- pdfjs.GlobalWorkerOptions.workerSrc = commonUtils.getAssetURL('local/vpu-signature/pdfjs/pdf.worker.min.js');
+ pdfjs.GlobalWorkerOptions.workerSrc = commonUtils.getAssetURL('local/dbp-signature/pdfjs/pdf.worker.min.js');
window.addEventListener('resize', this._onWindowResize);
@@ -387,13 +387,13 @@ export class PdfPreview extends ScopedElementsMixin(VPULitElement) {
"bottom": this.currentPageOriginalHeight - (top / this.canvasToPdfScale),
"angle": item.get("angle")
};
- const event = new CustomEvent("vpu-pdf-preview-accept",
+ const event = new CustomEvent("dbp-pdf-preview-accept",
{ "detail": data, bubbles: true, composed: true });
this.dispatchEvent(event);
}
sendCancelEvent() {
- const event = new CustomEvent("vpu-pdf-preview-cancel",
+ const event = new CustomEvent("dbp-pdf-preview-cancel",
{ "detail": {}, bubbles: true, composed: true });
this.dispatchEvent(event);
}
@@ -502,7 +502,7 @@ export class PdfPreview extends ScopedElementsMixin(VPULitElement) {
</form>
-->
<div id="pdf-main-container" class="${classMap({hidden: !this.isShowPage})}">
- <vpu-mini-spinner class="${classMap({hidden: this.isPageLoaded})}"></vpu-mini-spinner>
+ <dbp-mini-spinner class="${classMap({hidden: this.isPageLoaded})}"></dbp-mini-spinner>
<div class="${classMap({hidden: !this.isPageLoaded})}">
<div id="pdf-meta">
<div class="buttons ${classMap({hidden: !this.isPageLoaded})}">
@@ -515,13 +515,13 @@ export class PdfPreview extends ScopedElementsMixin(VPULitElement) {
title="${i18n.t('pdf-preview.first-page')}"
@click="${async () => { await this.showPage(1); } }"
?disabled="${this.isPageRenderingInProgress || this.currentPage === 1}">
- <vpu-icon name="angle-double-left"></vpu-icon>
+ <dbp-icon name="angle-double-left"></dbp-icon>
</button>
<button class="button"
title="${i18n.t('pdf-preview.previous-page')}"
@click="${async () => { if (this.currentPage > 1) await this.showPage(--this.currentPage); } }"
?disabled="${this.isPageRenderingInProgress || this.currentPage === 1}">
- <vpu-icon name="chevron-left"></vpu-icon>
+ <dbp-icon name="chevron-left"></dbp-icon>
</button>
<input type="number"
min="1"
@@ -533,13 +533,13 @@ export class PdfPreview extends ScopedElementsMixin(VPULitElement) {
title="${i18n.t('pdf-preview.next-page')}"
@click="${async () => { if (this.currentPage < this.totalPages) await this.showPage(++this.currentPage); } }"
?disabled="${this.isPageRenderingInProgress || this.currentPage === this.totalPages}">
- <vpu-icon name="chevron-right"></vpu-icon>
+ <dbp-icon name="chevron-right"></dbp-icon>
</button>
<button class="button"
title="${i18n.t('pdf-preview.last-page')}"
@click="${async () => { await this.showPage(this.totalPages); } }"
?disabled="${this.isPageRenderingInProgress || this.currentPage === this.totalPages}">
- <vpu-icon name="angle-double-right"></vpu-icon>
+ <dbp-icon name="angle-double-right"></dbp-icon>
</button>
</div>
<button class="button is-primary ${classMap({hidden: !this.isShowPlacement})}"
@@ -550,7 +550,7 @@ export class PdfPreview extends ScopedElementsMixin(VPULitElement) {
<canvas id="pdf-canvas"></canvas>
<canvas id="fabric-canvas" class="${classMap({hidden: !this.isShowPlacement})}"></canvas>
</div>
- <div class="${classMap({hidden: !this.isPageRenderingInProgress})}"><vpu-mini-spinner id="page-loader"></vpu-mini-spinner></div>
+ <div class="${classMap({hidden: !this.isPageRenderingInProgress})}"><dbp-mini-spinner id="page-loader"></dbp-mini-spinner></div>
</div>
</div>
`;
diff --git a/src/vpu-qualified-signature-pdf-upload.js b/src/dbp-qualified-signature-pdf-upload.js
similarity index 93%
rename from src/vpu-qualified-signature-pdf-upload.js
rename to src/dbp-qualified-signature-pdf-upload.js
index 4493b54..a78b485 100644
--- a/src/vpu-qualified-signature-pdf-upload.js
+++ b/src/dbp-qualified-signature-pdf-upload.js
@@ -1,25 +1,25 @@
import {createI18nInstance} from './i18n.js';
-import {humanFileSize} from 'vpu-common/i18next.js';
+import {humanFileSize} from 'dbp-common/i18next.js';
import {css, html} from 'lit-element';
import {ScopedElementsMixin} from '@open-wc/scoped-elements';
-import VPUSignatureLitElement from "./vpu-signature-lit-element";
-import {PdfPreview} from "./vpu-pdf-preview";
-import * as commonUtils from 'vpu-common/utils';
+import DBPSignatureLitElement from "./dbp-signature-lit-element";
+import {PdfPreview} from "./dbp-pdf-preview";
+import * as commonUtils from 'dbp-common/utils';
import * as utils from './utils';
-import {Button, Icon, MiniSpinner} from 'vpu-common';
-import * as commonStyles from 'vpu-common/styles';
+import {Button, Icon, MiniSpinner} from 'dbp-common';
+import * as commonStyles from 'dbp-common/styles';
import {classMap} from 'lit-html/directives/class-map.js';
-import {FileSource} from 'vpu-file-handling';
-import JSONLD from "vpu-common/jsonld";
+import {FileSource} from 'dbp-file-handling';
+import JSONLD from "dbp-common/jsonld";
import {TextSwitch} from './textswitch.js';
import nextcloudWebAppPasswordURL from 'consts:nextcloudWebAppPasswordURL';
import nextcloudWebDavURL from 'consts:nextcloudWebDavURL';
-import {FileSink} from "vpu-file-handling";
+import {FileSink} from "dbp-file-handling";
import FileSaver from 'file-saver';
const i18n = createI18nInstance();
-class QualifiedSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitElement) {
+class QualifiedSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitElement) {
constructor() {
super();
this.lang = i18n.language;
@@ -49,13 +49,13 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitEle
static get scopedElements() {
return {
- 'vpu-icon': Icon,
- 'vpu-file-source': FileSource,
- 'vpu-file-sink': FileSink,
- 'vpu-pdf-preview': PdfPreview,
- 'vpu-mini-spinner': MiniSpinner,
- 'vpu-button': Button,
- 'vpu-textswitch': TextSwitch,
+ 'dbp-icon': Icon,
+ 'dbp-file-source': FileSource,
+ 'dbp-file-sink': FileSink,
+ 'dbp-pdf-preview': PdfPreview,
+ 'dbp-mini-spinner': MiniSpinner,
+ 'dbp-button': Button,
+ 'dbp-textswitch': TextSwitch,
};
}
@@ -281,7 +281,7 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitEle
fetch(apiUrl, {
headers: {
'Content-Type': 'application/ld+json',
- 'Authorization': 'Bearer ' + window.VPUAuthToken,
+ 'Authorization': 'Bearer ' + window.DBPAuthToken,
},
})
.then(result => {
@@ -452,7 +452,7 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitEle
this.signaturePlacementInProgress = true;
this.withSigBlock = withSigBlock;
- const previewTag = this.constructor.getScopedTagName("vpu-pdf-preview");
+ const previewTag = this.constructor.getScopedTagName("dbp-pdf-preview");
await this._(previewTag).showPDF(
file,
withSigBlock, //this.queuedFilesPlacementModes[key] === "manual",
@@ -562,7 +562,7 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitEle
font-weight: 600;
}
- .notification vpu-mini-spinner {
+ .notification dbp-mini-spinner {
position: relative;
top: 2px;
margin-right: 5px;
@@ -576,7 +576,7 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitEle
color: white;
}
- /* using vpu-icon doesn't work */
+ /* using dbp-icon doesn't work */
button > [name=close], a > [name=close] {
font-size: 0.8em;
}
@@ -753,7 +753,7 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitEle
?disabled="${this.signingProcessEnabled}"
title="${i18n.t('qualified-pdf-upload.remove-queued-file-button-title')}"
@click="${() => { this.takeFileFromQueue(id); }}">
- <vpu-icon name="trash"></vpu-icon></button>
+ <dbp-icon name="trash"></dbp-icon></button>
</div>
<div class="bottom-line">
<div></div>
@@ -761,14 +761,14 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitEle
?disabled="${this.signingProcessEnabled}"
@click="${() => { this.showPreview(id); }}">${i18n.t('qualified-pdf-upload.show-preview')}</button>
<span class="headline">${i18n.t('qualified-pdf-upload.positioning')}:</span>
- <vpu-textswitch name1="auto"
+ <dbp-textswitch name1="auto"
name2="manual"
name="${this.queuedFilesPlacementModes[id] || "auto"}"
class="switch"
value1="${i18n.t('qualified-pdf-upload.positioning-automatic')}"
value2="${i18n.t('qualified-pdf-upload.positioning-manual')}"
?disabled="${this.signingProcessEnabled}"
- @change=${ (e) => this.queuePlacementSwitch(id, e.target.name) }></vpu-textswitch>
+ @change=${ (e) => this.queuePlacementSwitch(id, e.target.name) }></dbp-textswitch>
</div>
</div>
`);
@@ -796,7 +796,7 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitEle
<button class="button close"
title="${i18n.t('qualified-pdf-upload.download-file-button-title')}"
@click="${() => { this.fileDownloadClickHandler(file); }}">
- <vpu-icon name="download"></vpu-icon></button>
+ <dbp-icon name="download"></dbp-icon></button>
</div>
</div>
`);
@@ -824,11 +824,11 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitEle
<div class="buttons">
<button class="button"
title="${i18n.t('qualified-pdf-upload.re-upload-file-button-title')}"
- @click="${() => {this.fileQueueingClickHandler(data.file, id);}}"><vpu-icon name="reload"></vpu-icon></button>
+ @click="${() => {this.fileQueueingClickHandler(data.file, id);}}"><dbp-icon name="reload"></dbp-icon></button>
<button class="button"
title="${i18n.t('qualified-pdf-upload.remove-failed-file-button-title')}"
@click="${() => { this.takeFailedFileFromQueue(id); }}">
- <vpu-icon name="trash"></vpu-icon></button>
+ <dbp-icon name="trash"></dbp-icon></button>
</div>
</div>
<div class="bottom-line">
@@ -865,7 +865,7 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitEle
}
render() {
- const placeholderUrl = commonUtils.getAssetURL('local/vpu-signature/qualified-signature-placeholder.png');
+ const placeholderUrl = commonUtils.getAssetURL('local/dbp-signature/qualified-signature-placeholder.png');
return html`
<div class="${classMap({hidden: !this.isLoggedIn() || !this.hasSignaturePermissions() || this.isLoading()})}">
@@ -881,7 +881,7 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitEle
${i18n.t('qualified-pdf-upload.upload-button-label')}
</button>
- <vpu-file-source
+ <dbp-file-source
id="file-source"
allowed-mime-types="application/pdf"
enabled-sources="local${this.showTestNextcloudFilePicker ? ",nextcloud" : ""}"
@@ -892,8 +892,8 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitEle
?disabled="${this.signingProcessActive}"
text="${i18n.t('qualified-pdf-upload.upload-area-text')}"
button-label="${i18n.t('qualified-pdf-upload.upload-button-label')}"
- @vpu-file-source-file-selected="${this.onFileSelected}"
- ></vpu-file-source>
+ @dbp-file-source-file-selected="${this.onFileSelected}"
+ ></dbp-file-source>
</div>
</div>
<div id="grid-container">
@@ -944,12 +944,12 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitEle
class="button">
${i18n.t('qualified-pdf-upload.clear-all')}
</button>
- <vpu-button id="zip-download-button"
+ <dbp-button id="zip-download-button"
value="${i18n.t('qualified-pdf-upload.download-zip-button')}"
title="${i18n.t('qualified-pdf-upload.download-zip-button-tooltip')}"
class="is-right"
@click="${this.zipDownloadClickHandler}"
- type="is-primary"></vpu-button>
+ type="is-primary"></dbp-button>
</div>
</div>
<div class="control">
@@ -966,13 +966,13 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitEle
class="button">
${i18n.t('qualified-pdf-upload.clear-all')}
</button>
- <vpu-button id="re-upload-all-button"
+ <dbp-button id="re-upload-all-button"
?disabled="${this.uploadInProgress}"
value="${i18n.t('qualified-pdf-upload.re-upload-all-button')}"
title="${i18n.t('qualified-pdf-upload.re-upload-all-button-title')}"
class="is-right"
@click="${this.reUploadAllClickHandler}"
- type="is-primary"></vpu-button>
+ type="is-primary"></dbp-button>
</div>
</div>
<div class="control">
@@ -989,18 +989,18 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitEle
<strong>${this.currentFile.name}</strong> (${humanFileSize(this.currentFile !== undefined ? this.currentFile.size : 0)})
</div>
<button class="button is-cancel"
- @click="${this.hidePDF}"><vpu-icon name="close"></vpu-icon></button>
+ @click="${this.hidePDF}"><dbp-icon name="close"></dbp-icon></button>
</div>
- <vpu-pdf-preview lang="${this.lang}"
+ <dbp-pdf-preview lang="${this.lang}"
signature-placeholder-image-src="${placeholderUrl}"
signature-width="80"
signature-height="29"
- @vpu-pdf-preview-accept="${this.storePDFData}"
- @vpu-pdf-preview-cancel="${this.hidePDF}"></vpu-pdf-preview>
+ @dbp-pdf-preview-accept="${this.storePDFData}"
+ @dbp-pdf-preview-cancel="${this.hidePDF}"></dbp-pdf-preview>
</div>
<!-- File upload progress -->
<div id="upload-progress" class="field notification is-info ${classMap({hidden: !this.uploadInProgress})}">
- <vpu-mini-spinner></vpu-mini-spinner>
+ <dbp-mini-spinner></dbp-mini-spinner>
<strong>${this.uploadStatusFileName}</strong>
${this.uploadStatusText}
</div>
@@ -1014,7 +1014,7 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitEle
</div>
<button class="button is-cancel"
title="${i18n.t('qualified-pdf-upload.stop-signing-process-button')}"
- @click="${this.stopSigningProcess}"><vpu-icon name="close"></vpu-icon></button>
+ @click="${this.stopSigningProcess}"><dbp-icon name="close"></dbp-icon></button>
</div>
<!-- "scrolling" is deprecated, but still seem to help -->
<iframe id="iframe" scrolling="no"></iframe>
@@ -1030,17 +1030,17 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitEle
${i18n.t('error-permission-message')}
</div>
<div class="${classMap({hidden: !this.isLoading()})}">
- <vpu-mini-spinner></vpu-mini-spinner>
+ <dbp-mini-spinner></dbp-mini-spinner>
</div>
- <vpu-file-sink id="file-sink"
+ <dbp-file-sink id="file-sink"
filename="signed-documents.zip"
enabled-destinations="local${this.showTestNextcloudFilePicker ? ",nextcloud" : ""}"
nextcloud-auth-url="${nextcloudWebAppPasswordURL}"
nextcloud-web-dav-url="${nextcloudWebDavURL}"
lang="${this.lang}"
- ></vpu-file-sink>
+ ></dbp-file-sink>
`;
}
}
-commonUtils.defineCustomElement('vpu-qualified-signature-pdf-upload', QualifiedSignaturePdfUpload);
+commonUtils.defineCustomElement('dbp-qualified-signature-pdf-upload', QualifiedSignaturePdfUpload);
diff --git a/src/vpu-signature-lit-element.js b/src/dbp-signature-lit-element.js
similarity index 91%
rename from src/vpu-signature-lit-element.js
rename to src/dbp-signature-lit-element.js
index 4986e5d..4ef490c 100644
--- a/src/vpu-signature-lit-element.js
+++ b/src/dbp-signature-lit-element.js
@@ -1,9 +1,9 @@
import {LitElement} from "lit-element";
-import {EventBus} from 'vpu-common';
+import {EventBus} from 'dbp-common';
import buildinfo from 'consts:buildinfo';
import * as utils from "./utils";
-export default class VPUSignatureLitElement extends LitElement {
+export default class DBPSignatureLitElement extends LitElement {
constructor() {
super();
this.queuedFiles = [];
@@ -94,7 +94,7 @@ export default class VPUSignatureLitElement extends LitElement {
await fetch(url, {
method: 'POST',
headers: {
- 'Authorization': 'Bearer ' + window.VPUAuthToken,
+ 'Authorization': 'Bearer ' + window.DBPAuthToken,
},
body: formData
})
@@ -146,7 +146,7 @@ export default class VPUSignatureLitElement extends LitElement {
}
_hasSignaturePermissions(roleName) {
- return (window.VPUPerson && Array.isArray(window.VPUPerson.roles) && window.VPUPerson.roles.indexOf(roleName) !== -1);
+ return (window.DBPPerson && Array.isArray(window.DBPPerson.roles) && window.DBPPerson.roles.indexOf(roleName) !== -1);
}
_updateAuth(e) {
@@ -176,17 +176,17 @@ export default class VPUSignatureLitElement extends LitElement {
}
isLoggedIn() {
- return (window.VPUPerson !== undefined && window.VPUPerson !== null);
+ return (window.DBPPerson !== undefined && window.DBPPerson !== null);
}
isLoading() {
if (this._loginStatus === "logged-out")
return false;
- return (!this.isLoggedIn() && window.VPUAuthToken !== undefined);
+ return (!this.isLoggedIn() && window.DBPAuthToken !== undefined);
}
getOrganization() {
- const organizationSelect = this._("vpu-knowledge-base-organization-select");
+ const organizationSelect = this._("dbp-knowledge-base-organization-select");
if (organizationSelect) {
const objectText = organizationSelect.getAttribute("data-object");
diff --git a/src/vpu-signature-verification.js b/src/dbp-signature-verification.js
similarity index 94%
rename from src/vpu-signature-verification.js
rename to src/dbp-signature-verification.js
index 89a37cb..fa508de 100644
--- a/src/vpu-signature-verification.js
+++ b/src/dbp-signature-verification.js
@@ -1,21 +1,21 @@
import {createI18nInstance} from './i18n.js';
-import {humanFileSize} from 'vpu-common/i18next.js';
+import {humanFileSize} from 'dbp-common/i18next.js';
import {css, html} from 'lit-element';
import {ScopedElementsMixin} from '@open-wc/scoped-elements';
-import VPUSignatureLitElement from "./vpu-signature-lit-element";
-import {PdfPreview} from "./vpu-pdf-preview";
-import * as commonUtils from 'vpu-common/utils';
-import {Icon, MiniSpinner, Button} from 'vpu-common';
-import * as commonStyles from 'vpu-common/styles';
+import DBPSignatureLitElement from "./dbp-signature-lit-element";
+import {PdfPreview} from "./dbp-pdf-preview";
+import * as commonUtils from 'dbp-common/utils';
+import {Icon, MiniSpinner, Button} from 'dbp-common';
+import * as commonStyles from 'dbp-common/styles';
import {classMap} from 'lit-html/directives/class-map.js';
-import {FileSource} from 'vpu-file-handling';
-import JSONLD from "vpu-common/jsonld";
+import {FileSource} from 'dbp-file-handling';
+import JSONLD from "dbp-common/jsonld";
import nextcloudWebAppPasswordURL from 'consts:nextcloudWebAppPasswordURL';
import nextcloudWebDavURL from 'consts:nextcloudWebDavURL';
const i18n = createI18nInstance();
-class SignatureVerification extends ScopedElementsMixin(VPUSignatureLitElement) {
+class SignatureVerification extends ScopedElementsMixin(DBPSignatureLitElement) {
constructor() {
super();
this.lang = i18n.language;
@@ -41,11 +41,11 @@ class SignatureVerification extends ScopedElementsMixin(VPUSignatureLitElement)
static get scopedElements() {
return {
- 'vpu-icon': Icon,
- 'vpu-file-source': FileSource,
- 'vpu-pdf-preview': PdfPreview,
- 'vpu-mini-spinner': MiniSpinner,
- 'vpu-button': Button,
+ 'dbp-icon': Icon,
+ 'dbp-file-source': FileSource,
+ 'dbp-pdf-preview': PdfPreview,
+ 'dbp-mini-spinner': MiniSpinner,
+ 'dbp-button': Button,
};
}
@@ -264,7 +264,7 @@ class SignatureVerification extends ScopedElementsMixin(VPUSignatureLitElement)
console.log(file);
// start signature placement process
this.previewInProgress = true;
- const previewTag = this.constructor.getScopedTagName("vpu-pdf-preview");
+ const previewTag = this.constructor.getScopedTagName("dbp-pdf-preview");
await this._(previewTag).showPDF(file);
}
@@ -354,7 +354,7 @@ class SignatureVerification extends ScopedElementsMixin(VPUSignatureLitElement)
font-weight: 600;
}
- .notification vpu-mini-spinner {
+ .notification dbp-mini-spinner {
position: relative;
top: 2px;
margin-right: 5px;
@@ -368,7 +368,7 @@ class SignatureVerification extends ScopedElementsMixin(VPUSignatureLitElement)
color: white;
}
- /* using vpu-icon doesn't work */
+ /* using dbp-icon doesn't work */
button > [name=close], a > [name=close] {
font-size: 0.8em;
}
@@ -553,7 +553,7 @@ class SignatureVerification extends ScopedElementsMixin(VPUSignatureLitElement)
?disabled="${this.verificationProcessEnabled}"
title="${i18n.t('signature-verification.remove-queued-file-button-title')}"
@click="${() => { this.takeFileFromQueue(id); }}">
- <vpu-icon name="trash"></vpu-icon></button>
+ <dbp-icon name="trash"></dbp-icon></button>
</div>
<div class="bottom-line">
<div></div>
@@ -642,11 +642,11 @@ class SignatureVerification extends ScopedElementsMixin(VPUSignatureLitElement)
<div class="buttons">
<button class="button"
title="${i18n.t('signature-verification.re-upload-file-button-title')}"
- @click="${() => {this.fileQueueingClickHandler(data.file, id);}}"><vpu-icon name="reload"></vpu-icon></button>
+ @click="${() => {this.fileQueueingClickHandler(data.file, id);}}"><dbp-icon name="reload"></dbp-icon></button>
<button class="button"
title="${i18n.t('signature-verification.remove-failed-file-button-title')}"
@click="${() => { this.takeFailedFileFromQueue(id); }}">
- <vpu-icon name="trash"></vpu-icon></button>
+ <dbp-icon name="trash"></dbp-icon></button>
</div>
</div>
<div class="bottom-line">
@@ -664,7 +664,7 @@ class SignatureVerification extends ScopedElementsMixin(VPUSignatureLitElement)
}
render() {
- const placeholderUrl = commonUtils.getAssetURL('local/vpu-signature/official-signature-placeholder.png');
+ const placeholderUrl = commonUtils.getAssetURL('local/dbp-signature/official-signature-placeholder.png');
return html`
<div class="${classMap({hidden: !this.isLoggedIn() || !this.hasSignaturePermissions() || this.isLoading()})}">
@@ -679,7 +679,7 @@ class SignatureVerification extends ScopedElementsMixin(VPUSignatureLitElement)
class="button is-primary">
${i18n.t('qualified-pdf-upload.upload-button-label')}
</button>
- <vpu-file-source
+ <dbp-file-source
id="file-source"
allowed-mime-types="application/pdf"
enabled-sources="local${this.showTestNextcloudFilePicker ? ",nextcloud" : ""}"
@@ -690,8 +690,8 @@ class SignatureVerification extends ScopedElementsMixin(VPUSignatureLitElement)
?disabled="${this.verificationProcessActive}"
text="${i18n.t('signature-verification.upload-area-text')}"
button-label="${i18n.t('signature-verification.upload-button-label')}"
- @vpu-file-source-file-selected="${this.onFileSelected}"
- ></vpu-file-source>
+ @dbp-file-source-file-selected="${this.onFileSelected}"
+ ></dbp-file-source>
</div>
</div>
<div id="grid-container">
@@ -746,13 +746,13 @@ class SignatureVerification extends ScopedElementsMixin(VPUSignatureLitElement)
class="button">
${i18n.t('signature-verification.clear-all')}
</button>
- <vpu-button id="re-upload-all-button"
+ <dbp-button id="re-upload-all-button"
?disabled="${this.uploadInProgress}"
value="${i18n.t('signature-verification.re-upload-all-button')}"
title="${i18n.t('signature-verification.re-upload-all-button-title')}"
class="is-right"
@click="${this.reUploadAllClickHandler}"
- type="is-primary"></vpu-button>
+ type="is-primary"></dbp-button>
</div>
</div>
<div class="control">
@@ -769,17 +769,17 @@ class SignatureVerification extends ScopedElementsMixin(VPUSignatureLitElement)
<strong>${this.currentFile.name}</strong> (${humanFileSize(this.currentFile !== undefined ? this.currentFile.size : 0)})
</div>
<button class="button is-cancel"
- @click="${this.hidePDF}"><vpu-icon name="close"></vpu-icon></button>
+ @click="${this.hidePDF}"><dbp-icon name="close"></dbp-icon></button>
</div>
- <vpu-pdf-preview lang="${this.lang}"
+ <dbp-pdf-preview lang="${this.lang}"
signature-placeholder-image-src="${placeholderUrl}"
signature-width="146"
signature-height="42"
- @vpu-pdf-preview-cancel="${this.hidePDF}"></vpu-pdf-preview>
+ @dbp-pdf-preview-cancel="${this.hidePDF}"></dbp-pdf-preview>
</div>
<!-- File upload progress -->
<div id="upload-progress" class="field notification is-info ${classMap({hidden: !this.uploadInProgress})}">
- <vpu-mini-spinner></vpu-mini-spinner>
+ <dbp-mini-spinner></dbp-mini-spinner>
<strong>${this.uploadStatusFileName}</strong>
${this.uploadStatusText}
</div>
@@ -809,10 +809,10 @@ class SignatureVerification extends ScopedElementsMixin(VPUSignatureLitElement)
${i18n.t('error-permission-message')}
</div>
<div class="${classMap({hidden: !this.isLoading()})}">
- <vpu-mini-spinner></vpu-mini-spinner>
+ <dbp-mini-spinner></dbp-mini-spinner>
</div>
`;
}
}
-commonUtils.defineCustomElement('vpu-signature-verification', SignatureVerification);
+commonUtils.defineCustomElement('dbp-signature-verification', SignatureVerification);
diff --git a/src/dbp-signature.js b/src/dbp-signature.js
new file mode 100644
index 0000000..47faec6
--- /dev/null
+++ b/src/dbp-signature.js
@@ -0,0 +1,4 @@
+import {AppShell} from 'dbp-app-shell';
+import * as commonUtils from 'dbp-common/utils';
+
+commonUtils.defineCustomElement('dbp-signature', AppShell);
\ No newline at end of file
diff --git a/src/i18n.js b/src/i18n.js
index 51af2ff..8bec8ab 100644
--- a/src/i18n.js
+++ b/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/src/textswitch.js b/src/textswitch.js
index 5046ba7..dfe7ed1 100644
--- a/src/textswitch.js
+++ b/src/textswitch.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';
const BUTTON1 = "button1";
const BUTTON2 = "button2";
@@ -58,7 +58,7 @@ export class TextSwitch extends LitElement {
.active {
background-color: black !important;
- color: var(--vpu-primary-text-color) !important;
+ color: var(--dbp-primary-text-color) !important;
}
.button {
@@ -66,7 +66,7 @@ export class TextSwitch extends LitElement {
}
.button:hover {
- background-color: var(--vpu-secondary-bg-color) !important;
+ background-color: var(--dbp-secondary-bg-color) !important;
}
`;
}
diff --git a/src/vpu-signature.js b/src/vpu-signature.js
deleted file mode 100644
index 638b7ff..0000000
--- a/src/vpu-signature.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import {AppShell} from 'vpu-app-shell';
-import * as commonUtils from 'vpu-common/utils';
-
-commonUtils.defineCustomElement('vpu-signature', AppShell);
\ No newline at end of file
diff --git a/test/unit.js b/test/unit.js
index 2b0304c..611333e 100644
--- a/test/unit.js
+++ b/test/unit.js
@@ -1,13 +1,13 @@
import {assert} from 'chai';
-import '../src/vpu-official-signature-pdf-upload';
-import '../src/vpu-signature.js';
+import '../src/dbp-official-signature-pdf-upload';
+import '../src/dbp-signature.js';
-suite('vpu-official-signature-pdf-upload basics', () => {
+suite('dbp-official-signature-pdf-upload basics', () => {
let node;
suiteSetup(async () => {
- node = document.createElement('vpu-official-signature-pdf-upload');
+ node = document.createElement('dbp-official-signature-pdf-upload');
document.body.appendChild(node);
await node.updateComplete;
});
@@ -21,11 +21,11 @@ suite('vpu-official-signature-pdf-upload basics', () => {
});
});
-suite('vpu-signature-app basics', () => {
+suite('dbp-signature-app basics', () => {
let node;
suiteSetup(async () => {
- node = document.createElement('vpu-app');
+ node = document.createElement('dbp-app');
document.body.appendChild(node);
await node.updateComplete;
});
diff --git a/vendor/toolkit b/vendor/toolkit
index b081907..cea204a 160000
--- a/vendor/toolkit
+++ b/vendor/toolkit
@@ -1 +1 @@
-Subproject commit b081907b60a2894e6ef2e28700742b9c67134e1f
+Subproject commit cea204aee1f6efc312793efa99201959ceab9497
--
GitLab