Merge branch 'master' into provider-component

.gitlab-ci.yml

@@ -7,6 +7,7 @@ cache:
 
 stages:
   - test
+  - publish
 
 test:
   stage: test
@@ -14,3 +15,14 @@ test:
     - yarn config set cache-folder "$CI_PROJECT_DIR/_yarn_cache"
     - yarn install
     - yarn run test
+
+publish:
+  stage: publish
+  only:
+    refs:
+      - publish
+  script:
+    - sudo npm install --global can-npm-publish
+    - yarn config set cache-folder "$CI_PROJECT_DIR/_yarn_cache"
+    - yarn install
+    - yarn run publish

demo/README.md

@@ -23,9 +23,9 @@ You can then open <http://127.0.0.1:8001/>.
 ## Importing demo activities
 - imported demo activity has to be a `export class`
 - Add the line`import readme from 'path-to-activity/README.md';`
-    - example: `import readme from 'dbp-person-select/README.md';`
+    - example: `import readme from '@dbp-toolkit/person-select/README.md';`
 - Add the line `import {ExportclassName} from 'path-to-activity/src/activity-name';`
-    - example: `import {PersonSelectDemo} from 'dbp-person-select/src/dbp-person-select-demo';`
+    - example: `import {PersonSelectDemo} from '@dbp-toolkit/person-select/src/dbp-person-select-demo';`
 - Add the class to scopedElements
     - example ` static get scopedElements() {
                        return {

demo/package.json

 {
   "name": "dbp-toolkit-demo",
-  "version": "1.0.0",
+  "version": "0.1.0",
   "main": "src/toolkit-demo.js",
   "license": "LGPL-2.1-or-later",
   "private": true,
@@ -15,21 +15,21 @@
     "@babel/preset-env": "^7.10.3",
     "@babel/runtime-corejs3": "^7.10.3",
     "@rollup/plugin-babel": "^5.0.4",
-    "@rollup/plugin-commonjs": "^14.0.0",
+    "@rollup/plugin-commonjs": "^16.0.0",
     "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-node-resolve": "^8.1.0",
+    "@rollup/plugin-node-resolve": "^10.0.0",
     "@rollup/plugin-replace": "^2.3.3",
     "@rollup/plugin-url": "^5.0.1",
     "babel-eslint": "^10.0.3",
     "chai": "^4.2.0",
     "chokidar": "^3.4.0",
     "eslint": "^7.3.1",
-    "eslint-plugin-jsdoc": "^29.2.0",
+    "eslint-plugin-jsdoc": "^30.7.8",
     "glob": "^7.1.6",
-    "i18next-scanner": "^2.10.3",
+    "i18next-scanner": "^3.0.0",
     "karma": "^5.1.0",
     "karma-chrome-launcher": "^3.1.0",
-    "karma-firefox-launcher": "^1.3.0",
+    "karma-firefox-launcher": "^2.1.0",
     "karma-mocha": "^2.0.1",
     "mocha": "^8.0.1",
     "rollup": "^2.18.1",
@@ -40,21 +40,22 @@
     "rollup-plugin-license": "^2.1.0",
     "rollup-plugin-md": "^0.0.7",
     "rollup-plugin-serve": "^1.0.1",
-    "rollup-plugin-terser": "^6.1.0",
+    "rollup-plugin-terser": "^7.0.2",
     "selfsigned": "^1.10.7"
   },
   "dependencies": {
     "@open-wc/scoped-elements": "^1.1.1",
-    "dbp-app-shell": "^1.0.0",
-    "dbp-auth": "^1.0.0",
-    "dbp-common": "^1.0.0",
-    "dbp-file-handling": "^1.0.0",
-    "dbp-language-select": "^1.0.0",
-    "dbp-notification": "^1.0.0",
-    "dbp-person-select": "^1.0.0",
-    "dbp-person-profile": "^1.0.0",
-    "fabric": "^3.6.3",
+    "@dbp-toolkit/app-shell": "^0.1.0",
+    "@dbp-toolkit/auth": "^0.1.0",
+    "@dbp-toolkit/common": "^0.1.0",
+    "@dbp-toolkit/file-handling": "^0.1.0",
+    "@dbp-toolkit/language-select": "^0.1.0",
+    "@dbp-toolkit/notification": "^0.1.0",
+    "@dbp-toolkit/person-profile": "^0.1.0",
+    "@dbp-toolkit/person-select": "^0.1.0",
+    "fabric": "^4.2.0",
     "file-saver": "^2.0.2",
+    "highlight.js": "^10.1.2",
     "i18next": "^19.5.1",
     "jszip": "^3.5.0",
     "lit-element": "^2.3.1",
@@ -63,8 +64,7 @@
     "source-sans-pro": "^2.45.0",
     "tabulator-tables": "^4.7.0",
     "universal-router": "^9.0.1",
-    "webdav": "^3.3.0",
-    "highlight.js": "^10.1.2"
+    "webdav": "^3.3.0"
   },
   "scripts": {
     "build-dev": "rollup -c --environment BUILD:development",

demo/rollup.config.js

@@ -253,14 +253,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/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: 'node_modules/@dbp-toolkit/common/src/spinner.js', dest: 'dist/local/' + pkg.name, rename: 'spinner.js'},
+                {src: 'node_modules/@dbp-toolkit/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/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'},
+                {src: 'node_modules/@dbp-toolkit/common/assets/icons/*.svg', dest: 'dist/local/@dbp-toolkit/common/icons'},
+                {src: 'node_modules/tabulator-tables/dist/css', dest: 'dist/local/@dbp-toolkit/file-handling/tabulator-tables'},
                 {src: 'node_modules/qr-scanner/qr-scanner-worker.*', dest: 'dist/local/qr-code-scanner'},
             ],
         }),

demo/src/dbp-common-demo-activity.js

+import {css, html, LitElement} from 'lit-element';
+import {ScopedElementsMixin} from '@open-wc/scoped-elements';
+import {DbpCommonDemo} from '@dbp-toolkit/common/dbp-common-demo';
+import * as commonUtils from '@dbp-toolkit/common/utils';
+import * as commonStyles from '@dbp-toolkit/common/styles';
+import {unsafeHTML} from 'lit-html/directives/unsafe-html.js';
+import readme from '@dbp-toolkit/common/README.md';
+import highlightCSSPath from 'highlight.js/styles/default.css';
+import * as demoStyles from "./styles";
+
+class DbpCommonDemoActivity extends ScopedElementsMixin(LitElement) {
+    static get scopedElements() {
+        return {
+            'dbp-common-demo': DbpCommonDemo,
+        };
+    }
+
+    static get properties() {
+        return {
+        };
+    }
+
+    connectedCallback() {
+        super.connectedCallback();
+
+        this.updateComplete.then(()=>{
+        });
+    }
+
+    static get styles() {
+        // language=css
+        return [
+            commonStyles.getThemeCSS(),
+            commonStyles.getGeneralCSS(),
+            demoStyles.getDemoCSS(),
+            css`
+            h1.title {margin-bottom: 1em;}
+            div.container {margin-bottom: 1.5em;}
+
+            #demo{
+                display: block;
+                padding-top: 50px;
+            }
+            
+            `
+        ];
+    }
+
+    render() {
+        return html`
+
+                ${unsafeHTML(readme)}
+                <dbp-common-demo id="demo" lang="en"></dbp-common-demo>
+        `;
+    }
+}
+
+commonUtils.defineCustomElement('dbp-common-demo-activity', DbpCommonDemoActivity);

demo/src/dbp-data-table-view-demo-activity.js

+import {css, html, LitElement} from 'lit-element';
+import {ScopedElementsMixin} from '@open-wc/scoped-elements';
+import {DataTableViewDemo} from '@dbp-toolkit/data-table-view/src/dbp-data-table-view-demo';
+import * as commonUtils from '@dbp-toolkit/common/utils';
+import * as commonStyles from '@dbp-toolkit/common/styles';
+import {unsafeHTML} from 'lit-html/directives/unsafe-html.js';
+import readme from '@dbp-toolkit/data-table-view/README.md';
+import highlightCSSPath from 'highlight.js/styles/default.css';
+import * as demoStyles from "./styles";
+
+class DbpActivityNameDemoActivity extends ScopedElementsMixin(LitElement) { //TODO
+    static get scopedElements() {
+        return {
+            'dbp-data-table-view-demo': DataTableViewDemo,
+        };
+    }
+
+    static get properties() {
+        return {
+        };
+    }
+
+    connectedCallback() {
+        super.connectedCallback();
+
+        this.updateComplete.then(()=>{
+        });
+    }
+
+    static get styles() {
+        // language=css
+        return [
+            commonStyles.getThemeCSS(),
+            commonStyles.getGeneralCSS(),
+            demoStyles.getDemoCSS(),
+            css`
+            h1.title {margin-bottom: 1em;}
+            div.container {margin-bottom: 1.5em;}
+
+            #demo{
+                display: block;
+                padding-top: 50px;
+            }
+            
+            `
+        ];
+    }
+
+    render() {
+        return html`
+
+                ${unsafeHTML(readme)}
+                <dbp-data-table-view-demo id="demo" lang="en"></dbp-data-table-view-demo>
+        `;
+    }
+}
+
+commonUtils.defineCustomElement('dbp-data-table-view-demo-activity', DbpActivityNameDemoActivity);

demo/src/dbp-demo-template.js

 import {css, html, LitElement} from 'lit-element';
 import {ScopedElementsMixin} from '@open-wc/scoped-elements';
-//import {ClassName} from 'dbp-package-name/src/dbp-demo-activity-name'; TODO
-import * as commonUtils from 'dbp-common/utils';
-import * as commonStyles from 'dbp-common/styles';
+//import {ClassName} from '@dbp-toolkit/package-name/src/dbp-demo-activity-name'; TODO
+import * as commonUtils from '@dbp-toolkit/common/utils';
+import * as commonStyles from '@dbp-toolkit/common/styles';
 import {unsafeHTML} from 'lit-html/directives/unsafe-html.js';
-// import readme from 'dbp-class-name/README.md'; TODO
+// import readme from '@dbp-toolkit/class-name/README.md'; TODO
 import highlightCSSPath from 'highlight.js/styles/default.css';
 import * as demoStyles from "./styles";
 

demo/src/dbp-file-handling-demo-activity.js

+import {css, html, LitElement} from 'lit-element';
+import {ScopedElementsMixin} from '@open-wc/scoped-elements';
+import {FileSourceDemo} from '@dbp-toolkit/file-handling/src/demo';
+import * as commonUtils from '@dbp-toolkit/common/utils';
+import * as commonStyles from '@dbp-toolkit/common/styles';
+import {unsafeHTML} from 'lit-html/directives/unsafe-html.js';
+import readme from '@dbp-toolkit/file-handling/README.md';
+import highlightCSSPath from 'highlight.js/styles/default.css';
+import * as demoStyles from "./styles";
+
+class DbpFileHandlingDemoActivity extends ScopedElementsMixin(LitElement) {
+    static get scopedElements() {
+        return {
+            'dbp-file-handling-demo': FileSourceDemo,
+        };
+    }
+
+    static get properties() {
+        return {
+        };
+    }
+
+    connectedCallback() {
+        super.connectedCallback();
+
+        this.updateComplete.then(()=>{
+        });
+    }
+
+    static get styles() {
+        // language=css
+        return [
+            commonStyles.getThemeCSS(),
+            commonStyles.getGeneralCSS(),
+            demoStyles.getDemoCSS(),
+            css`
+            h1.title {margin-bottom: 1em;}
+            div.container {margin-bottom: 1.5em;}
+
+            #demo{
+                display: block;
+                padding-top: 50px;
+            }
+            
+            `
+        ];
+    }
+
+    render() {
+        return html`
+                ${unsafeHTML(readme)}
+                <dbp-file-handling-demo id="demo" lang="en"></dbp-file-handling-demo>
+        `;
+    }
+}
+
+commonUtils.defineCustomElement('dbp-file-handling-demo-activity', DbpFileHandlingDemoActivity);

demo/src/dbp-knowledge-base-web-page-element-view-demo-activity.js

 import {css, html, LitElement} from 'lit-element';
 import {ScopedElementsMixin} from '@open-wc/scoped-elements';
-import {KnowledgeBaseWebPageElementViewDemo} from 'dbp-knowledge-base-web-page-element-view/src/dbp-knowledge-base-web-page-element-view-demo';
-import * as commonUtils from 'dbp-common/utils';
-import * as commonStyles from 'dbp-common/styles';
+import {KnowledgeBaseWebPageElementViewDemo} from '@dbp-toolkit/knowledge-base-web-page-element-view/src/dbp-knowledge-base-web-page-element-view-demo';
+import * as commonUtils from '@dbp-toolkit/common/utils';
+import * as commonStyles from '@dbp-toolkit/common/styles';
 import {unsafeHTML} from 'lit-html/directives/unsafe-html.js';
-import readme from 'dbp-knowledge-base-web-page-element-view/README.md';
+import readme from '@dbp-toolkit/knowledge-base-web-page-element-view/README.md';
 import highlightCSSPath from 'highlight.js/styles/default.css';
 import * as demoStyles from "./styles";
 

demo/src/dbp-language-select-demo-activity.js

+import {css, html, LitElement} from 'lit-element';
+import {ScopedElementsMixin} from '@open-wc/scoped-elements';
+import {LanguageSelectDemo} from '@dbp-toolkit/language-select/src/dbp-language-select-demo';
+import * as commonUtils from '@dbp-toolkit/common/utils';
+import * as commonStyles from '@dbp-toolkit/common/styles';
+import {unsafeHTML} from 'lit-html/directives/unsafe-html.js';
+import readme from '@dbp-toolkit/language-select/README.md';
+import highlightCSSPath from 'highlight.js/styles/default.css';
+import * as demoStyles from "./styles";
+
+class DbpLanguageSelectDemoActivity extends ScopedElementsMixin(LitElement) {
+    static get scopedElements() {
+        return {
+            'dbp-language-select-demo': LanguageSelectDemo,
+        };
+    }
+
+    static get properties() {
+        return {
+        };
+    }
+
+    connectedCallback() {
+        super.connectedCallback();
+
+        this.updateComplete.then(()=>{
+        });
+    }
+
+    static get styles() {
+        // language=css
+        return [
+            commonStyles.getThemeCSS(),
+            commonStyles.getGeneralCSS(),
+            demoStyles.getDemoCSS(),
+            css`
+            h1.title {margin-bottom: 1em;}
+            div.container {margin-bottom: 1.5em;}
+
+            #demo{
+                display: block;
+                padding-top: 50px;
+            }
+            
+            `
+        ];
+    }
+
+    render() {
+        return html`
+
+                ${unsafeHTML(readme)}
+                <dbp-language-select-demo id="demo" lang="en"></dbp-language-select-demo>
+            
+        `;
+    }
+}
+
+commonUtils.defineCustomElement('dbp-language-select-demo-activity', DbpLanguageSelectDemoActivity);

demo/src/dbp-matomo-demo-activity.js

 import {css, html, LitElement} from 'lit-element';
 import {ScopedElementsMixin} from '@open-wc/scoped-elements';
-import {MatomoDemo} from 'dbp-matomo/src/dbp-matomo-demo';
-import * as commonUtils from 'dbp-common/utils';
-import * as commonStyles from 'dbp-common/styles';
+import {MatomoDemo} from '@dbp-toolkit/matomo/src/dbp-matomo-demo';
+import * as commonUtils from '@dbp-toolkit/common/utils';
+import * as commonStyles from '@dbp-toolkit/common/styles';
 import {unsafeHTML} from 'lit-html/directives/unsafe-html.js';
-import readme from 'dbp-matomo/README.md';
+import readme from '@dbp-toolkit/matomo/README.md';
 import highlightCSSPath from 'highlight.js/styles/default.css';
 import * as demoStyles from "./styles";
 

demo/src/dbp-notification-demo-activity.js

 import {css, html, LitElement} from 'lit-element';
 import {ScopedElementsMixin} from '@open-wc/scoped-elements';
-import {NotificationDemo} from 'dbp-notification/src/dbp-notification-demo';
-import * as commonUtils from 'dbp-common/utils';
-import * as commonStyles from 'dbp-common/styles';
+import {NotificationDemo} from '@dbp-toolkit/notification/src/dbp-notification-demo';
+import * as commonUtils from '@dbp-toolkit/common/utils';
+import * as commonStyles from '@dbp-toolkit/common/styles';
 import {unsafeHTML} from 'lit-html/directives/unsafe-html.js';
-import readme from 'dbp-notification/README.md';
+import readme from '@dbp-toolkit/notification/README.md';
 import highlightCSSPath from 'highlight.js/styles/default.css';
 import * as demoStyles from "./styles";
 

demo/src/dbp-person-profile-demo-activity.js

 import {css, html, LitElement} from 'lit-element';
 import {ScopedElementsMixin} from '@open-wc/scoped-elements';
-import {PersonProfileDemo} from 'dbp-person-profile/src/dbp-person-profile-demo';
-import * as commonUtils from 'dbp-common/utils';
-import * as commonStyles from 'dbp-common/styles';
+import {PersonProfileDemo} from '@dbp-toolkit/person-profile/src/dbp-person-profile-demo';
+import * as commonUtils from '@dbp-toolkit/common/utils';
+import * as commonStyles from '@dbp-toolkit/common/styles';
 import {unsafeHTML} from 'lit-html/directives/unsafe-html.js';
-import readme from 'dbp-person-profile/README.md';
+import readme from '@dbp-toolkit/person-profile/README.md';
 import highlightCSSPath from 'highlight.js/styles/default.css';
 import * as demoStyles from "./styles";
 

demo/src/dbp-person-select-demo-activity.js

 import {css, html, LitElement} from 'lit-element';
 import {ScopedElementsMixin} from '@open-wc/scoped-elements';
-import {PersonSelectDemo} from 'dbp-person-select/src/dbp-person-select-demo';
-import * as commonUtils from 'dbp-common/utils';
-import * as commonStyles from 'dbp-common/styles';
+import {PersonSelectDemo} from '@dbp-toolkit/person-select/src/dbp-person-select-demo';
+import * as commonUtils from '@dbp-toolkit/common/utils';
+import * as commonStyles from '@dbp-toolkit/common/styles';
 import {unsafeHTML} from 'lit-html/directives/unsafe-html.js';
-import readme from 'dbp-person-select/README.md';
+import readme from '@dbp-toolkit/person-select/README.md';
 import highlightCSSPath from 'highlight.js/styles/default.css';
 import * as demoStyles from "./styles";
 

demo/src/dbp-qr-code-scanner-demo-activity.js

 import {css, html, LitElement} from 'lit-element';
 import {ScopedElementsMixin} from '@open-wc/scoped-elements';
-import {QrCodeScannerDemo} from 'dbp-qr-code-scanner/src/dbp-qr-code-scanner-demo';
-import * as commonUtils from 'dbp-common/utils';
-import * as commonStyles from 'dbp-common/styles';
+import {QrCodeScannerDemo} from '@dbp-toolkit/qr-code-scanner/src/dbp-qr-code-scanner-demo';
+import * as commonUtils from '@dbp-toolkit/common/utils';
+import * as commonStyles from '@dbp-toolkit/common/styles';
 import {unsafeHTML} from 'lit-html/directives/unsafe-html.js';
-import readme from 'dbp-qr-code-scanner/README.md';
+import readme from '@dbp-toolkit/qr-code-scanner/README.md';
 import highlightCSSPath from 'highlight.js/styles/default.css';
 import * as demoStyles from './styles';
 

demo/src/dbp-toolkit-demo.js

-import {AppShell} from 'dbp-app-shell';
-import * as commonUtils from 'dbp-common/utils';
+import {AppShell} from '@dbp-toolkit/app-shell';
+import * as commonUtils from '@dbp-toolkit/common/utils';
 
 commonUtils.defineCustomElement('dbp-toolkit-demo', AppShell);

package.json

 {
   "name": "dbp-toolkit",
-  "version": "1.0.0",
+  "version": "0.1.0",
   "description": "",
   "main": "index.js",
   "private": true,
@@ -8,7 +8,8 @@
     "packages/*"
   ],
   "scripts": {
-    "test": "lerna run --parallel test"
+    "test": "lerna run test",
+    "publish": "lerna run publish"
   },
   "author": "",
   "license": "LGPL-2.1-or-later",

packages/app-shell/assets/index.html

@@ -7,6 +7,12 @@
     <style>
         :root {
             font-family: sans-serif;
+            font-weight: 300;
+            font-size: 11pt;
+        }
+
+        body {
+            margin: 0;
         }
     </style>
 

packages/app-shell/package.json

 {
-  "name": "dbp-app-shell",
-  "version": "1.0.0",
+  "name": "@dbp-toolkit/app-shell",
+  "version": "0.1.0",
   "main": "src/index.js",
   "license": "LGPL-2.1-or-later",
   "private": true,
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^15.1.0",
+    "@rollup/plugin-commonjs": "^16.0.0",
     "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-node-resolve": "^9.0.0",
+    "@rollup/plugin-node-resolve": "^10.0.0",
     "babel-eslint": "^10.1.0",
     "chai": "^4.2.0",
     "eslint": "^7.3.1",
@@ -15,10 +15,10 @@
     "glob": "^7.1.6",
     "karma": "^5.1.0",
     "karma-chrome-launcher": "^3.0.0",
-    "karma-firefox-launcher": "^1.3.0",
+    "karma-firefox-launcher": "^2.1.0",
     "karma-mocha": "^2.0.1",
     "mocha": "^8.0.1",
-    "rollup": "^2.19.0",
+    "rollup": "^2.33.3",
     "rollup-plugin-consts": "^1.0.1",
     "rollup-plugin-copy": "^3.1.0",
     "rollup-plugin-delete": "^2.0.0",
@@ -26,14 +26,14 @@
     "rollup-plugin-serve": "^1.0.1"
   },
   "dependencies": {
-    "@open-wc/scoped-elements": "^1.1.1",
-    "dbp-auth": "^1.0.0",
-    "dbp-common": "^1.0.0",
-    "dbp-language-select": "^1.0.0",
-    "dbp-matomo": "^1.0.0",
-    "dbp-notification": "^1.0.0",
-    "dbp-person-profile": "^1.0.0",
-    "i18next": "^19.5.3",
+    "@dbp-toolkit/auth": "^0.1.0",
+    "@dbp-toolkit/common": "^0.1.0",
+    "@dbp-toolkit/language-select": "^0.1.0",
+    "@dbp-toolkit/matomo": "^0.1.0",
+    "@dbp-toolkit/notification": "^0.1.0",
+    "@dbp-toolkit/person-profile": "^0.1.0",
+    "@open-wc/scoped-elements": "^1.3.2",
+    "i18next": "^19.8.4",
     "lit-element": "^2.3.1",
     "lit-html": "^1.1.1",
     "universal-router": "^9.0.1"
@@ -45,6 +45,7 @@
     "watch": "npm run watch-local",
     "watch-local": "rollup -c --watch",
     "test": "npm run build-test && karma start --singleRun",
+    "publish": "can-npm-publish --verbose && npm run build && echo 'Todo: Publish' || true",
     "lint": "eslint ."
   }
 }