Skip to content
Snippets Groups Projects
Commit 6fb3626e authored by Steinwender, Tamara's avatar Steinwender, Tamara
Browse files

Merge branch 'master' of gitlab.tugraz.at:dbp/web-components/toolkit

parents d0d9350e 82715f4f
No related branches found
No related tags found
No related merge requests found
Pipeline #14218 passed
Showing
with 42 additions and 42 deletions
import {html, LitElement, css} from 'lit-element'; import {html, LitElement, css} from 'lit-element';
import * as commonStyles from 'dbp-common/styles'; import * as commonStyles from '@dbp-toolkit/common/styles';
import {createI18nInstance} from './i18n.js'; import {createI18nInstance} from './i18n.js';
const i18n = createI18nInstance(); const i18n = createI18nInstance();
......
{ {
"name": "dbp-auth", "name": "@dbp-toolkit/auth",
"version": "1.0.0", "version": "0.1.0",
"main": "src/index.js", "main": "src/index.js",
"license": "LGPL-2.1-or-later", "license": "LGPL-2.1-or-later",
"private": true, "private": true,
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
}, },
"dependencies": { "dependencies": {
"@open-wc/scoped-elements": "^1.3.2", "@open-wc/scoped-elements": "^1.3.2",
"dbp-common": "^1.0.0", "@dbp-toolkit/common": "^0.1.0",
"event-target-shim": "^5.0.1", "event-target-shim": "^5.0.1",
"lit-element": "^2.3.1" "lit-element": "^2.3.1"
}, },
......
...@@ -46,7 +46,7 @@ export default (async () => { ...@@ -46,7 +46,7 @@ export default (async () => {
{src: 'assets/index.html', dest:'dist'}, {src: 'assets/index.html', dest:'dist'},
{src: 'assets/silent-check-sso.html', dest: 'dist/local/' + pkg.name}, {src: 'assets/silent-check-sso.html', dest: 'dist/local/' + pkg.name},
{src: 'assets/favicon.ico', dest:'dist'}, {src: 'assets/favicon.ico', dest:'dist'},
{src: await getPackagePath('dbp-common', 'assets/icons/*.svg'), dest: 'dist/local/dbp-common/icons'}, {src: await getPackagePath('@dbp-toolkit/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 (process.env.ROLLUP_WATCH === 'true') ? serve({contentBase: 'dist', host: '127.0.0.1', port: 8002}) : false
......
import {i18n} from './i18n.js'; import {i18n} from './i18n.js';
import JSONLD from 'dbp-common/jsonld'; import JSONLD from '@dbp-toolkit/common/jsonld';
import * as commonUtils from 'dbp-common/utils'; import * as commonUtils from '@dbp-toolkit/common/utils';
import {EventBus} from 'dbp-common'; import {EventBus} from '@dbp-toolkit/common';
import {KeycloakWrapper} from './keycloak.js'; import {KeycloakWrapper} from './keycloak.js';
import {LitElement} from "lit-element"; import {LitElement} from "lit-element";
import {LoginStatus} from './util.js'; import {LoginStatus} from './util.js';
......
...@@ -3,7 +3,7 @@ import {html, LitElement} from 'lit-element'; ...@@ -3,7 +3,7 @@ import {html, LitElement} from 'lit-element';
import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import {ScopedElementsMixin} from '@open-wc/scoped-elements';
import {AuthKeycloak} from './auth-keycloak.js'; import {AuthKeycloak} from './auth-keycloak.js';
import {LoginButton} from './login-button.js'; import {LoginButton} from './login-button.js';
import * as commonUtils from 'dbp-common/utils'; import * as commonUtils from '@dbp-toolkit/common/utils';
class AuthDemo extends ScopedElementsMixin(LitElement) { class AuthDemo extends ScopedElementsMixin(LitElement) {
constructor() { constructor() {
......
import {defineCustomElement} from 'dbp-common/utils'; import {defineCustomElement} from '@dbp-toolkit/common/utils';
import {AuthKeycloak} from './auth-keycloak.js'; import {AuthKeycloak} from './auth-keycloak.js';
import {LoginButton} from './login-button.js'; import {LoginButton} from './login-button.js';
......
import {createInstance} from 'dbp-common/i18next.js'; import {createInstance} from '@dbp-toolkit/common/i18next.js';
import de from './i18n/de/translation.json'; import de from './i18n/de/translation.json';
import en from './i18n/en/translation.json'; import en from './i18n/en/translation.json';
......
...@@ -2,9 +2,9 @@ import {i18n} from './i18n.js'; ...@@ -2,9 +2,9 @@ import {i18n} from './i18n.js';
import {html, css} from 'lit-element'; import {html, css} from 'lit-element';
import {unsafeHTML} from 'lit-html/directives/unsafe-html.js'; import {unsafeHTML} from 'lit-html/directives/unsafe-html.js';
import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import {ScopedElementsMixin} from '@open-wc/scoped-elements';
import * as commonStyles from 'dbp-common/styles'; import * as commonStyles from '@dbp-toolkit/common/styles';
import {LitElement} from "lit-element"; import {LitElement} from "lit-element";
import {EventBus} from 'dbp-common'; import {EventBus} from '@dbp-toolkit/common';
import {LoginStatus} from './util.js'; import {LoginStatus} from './util.js';
let logoutSVG = ` let logoutSVG = `
......
{ {
"name": "dbp-check-in-place-select", "name": "@dbp-toolkit/check-in-place-select",
"version": "1.0.0", "version": "0.1.0",
"main": "src/index.js", "main": "src/index.js",
"license": "LGPL-2.1-or-later", "license": "LGPL-2.1-or-later",
"private": true, "private": true,
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
}, },
"dependencies": { "dependencies": {
"@open-wc/scoped-elements": "^1.3.2", "@open-wc/scoped-elements": "^1.3.2",
"dbp-auth": "^1.0.0", "@dbp-toolkit/auth": "^0.1.0",
"dbp-common": "^1.0.0", "@dbp-toolkit/common": "^0.1.0",
"jquery": "^3.4.1", "jquery": "^3.4.1",
"lit-element": "^2.3.1", "lit-element": "^2.3.1",
"select2": "^4.0.10" "select2": "^4.0.10"
......
...@@ -52,7 +52,7 @@ export default (async () => { ...@@ -52,7 +52,7 @@ export default (async () => {
copy({ copy({
targets: [ targets: [
{src: 'assets/index.html', dest: 'dist'}, {src: 'assets/index.html', dest: 'dist'},
{src: await getPackagePath('dbp-common', 'assets/icons/*.svg'), dest: 'dist/local/dbp-common/icons'}, {src: await getPackagePath('@dbp-toolkit/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 (process.env.ROLLUP_WATCH === 'true') ? serve({contentBase: 'dist', host: '127.0.0.1', port: 8002}) : false
......
...@@ -3,15 +3,15 @@ import {findObjectInApiResults} from './utils.js'; ...@@ -3,15 +3,15 @@ import {findObjectInApiResults} from './utils.js';
import select2 from 'select2'; import select2 from 'select2';
import select2LangDe from './i18n/de/select2' import select2LangDe from './i18n/de/select2'
import select2LangEn from './i18n/en/select2' import select2LangEn from './i18n/en/select2'
import JSONLD from 'dbp-common/jsonld'; import JSONLD from '@dbp-toolkit/common/jsonld';
import {css, html, LitElement} from 'lit-element'; import {css, html, LitElement} from 'lit-element';
import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import {ScopedElementsMixin} from '@open-wc/scoped-elements';
import {i18n} from './i18n.js'; import {i18n} from './i18n.js';
import {Icon} from 'dbp-common'; import {Icon} from '@dbp-toolkit/common';
import * as commonUtils from 'dbp-common/utils'; import * as commonUtils from '@dbp-toolkit/common/utils';
import * as commonStyles from 'dbp-common/styles'; import * as commonStyles from '@dbp-toolkit/common/styles';
import select2CSSPath from 'select2/dist/css/select2.min.css'; import select2CSSPath from 'select2/dist/css/select2.min.css';
import * as errorUtils from "dbp-common/error"; import * as errorUtils from "@dbp-toolkit/common/error";
const checkInPlaceContext = { const checkInPlaceContext = {
......
...@@ -2,9 +2,9 @@ import {i18n} from './i18n.js'; ...@@ -2,9 +2,9 @@ import {i18n} from './i18n.js';
import {css, html, LitElement} from 'lit-element'; import {css, html, LitElement} from 'lit-element';
import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import {ScopedElementsMixin} from '@open-wc/scoped-elements';
import {CheckInPlaceSelect} from './check-in-place-select.js'; import {CheckInPlaceSelect} from './check-in-place-select.js';
import {AuthKeycloak, LoginButton} from 'dbp-auth'; import {AuthKeycloak, LoginButton} from '@dbp-toolkit/auth';
import * as commonUtils from 'dbp-common/utils'; import * as commonUtils from '@dbp-toolkit/common/utils';
import * as commonStyles from 'dbp-common/styles'; import * as commonStyles from '@dbp-toolkit/common/styles';
class CheckInPlaceSelectDemo extends ScopedElementsMixin(LitElement) { class CheckInPlaceSelectDemo extends ScopedElementsMixin(LitElement) {
constructor() { constructor() {
......
import * as commonUtils from 'dbp-common/utils'; import * as commonUtils from '@dbp-toolkit/common/utils';
import {CheckInPlaceSelect} from './check-in-place-select.js'; import {CheckInPlaceSelect} from './check-in-place-select.js';
commonUtils.defineCustomElement('dbp-check-in-place-select', CheckInPlaceSelect); commonUtils.defineCustomElement('dbp-check-in-place-select', CheckInPlaceSelect);
import {createInstance} from 'dbp-common/i18next.js'; import {createInstance} from '@dbp-toolkit/common/i18next.js';
import de from './i18n/de/translation.json'; import de from './i18n/de/translation.json';
import en from './i18n/en/translation.json'; import en from './i18n/en/translation.json';
......
{ {
"name": "dbp-common", "name": "@dbp-toolkit/common",
"version": "1.0.1", "version": "0.1.0",
"module": "index.js", "module": "index.js",
"license": "LGPL-2.1-or-later", "license": "LGPL-2.1-or-later",
"private": true, "private": true,
......
{ {
"name": "dbp-data-table-view", "name": "@dbp-toolkit/data-table-view",
"version": "1.0.0", "version": "0.1.0",
"main": "src/index.js", "main": "src/index.js",
"license": "LGPL-2.1-or-later", "license": "LGPL-2.1-or-later",
"private": true, "private": true,
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
"datatables.net-dt": "^1.10.20", "datatables.net-dt": "^1.10.20",
"datatables.net-responsive": "^2.2.3", "datatables.net-responsive": "^2.2.3",
"datatables.net-responsive-dt": "^2.2.3", "datatables.net-responsive-dt": "^2.2.3",
"dbp-auth": "^1.0.0", "@dbp-toolkit/auth": "^0.1.0",
"dbp-common": "^1.0.0", "@dbp-toolkit/common": "^0.1.0",
"i18next": "^19.8.3", "i18next": "^19.8.3",
"jquery": "^3.4.1", "jquery": "^3.4.1",
"jszip": "^3.2.2", "jszip": "^3.2.2",
......
...@@ -61,7 +61,7 @@ export default (async () => { ...@@ -61,7 +61,7 @@ export default (async () => {
{src: 'assets/*.ico', dest: 'dist/local/' + pkg.name}, {src: 'assets/*.ico', dest: 'dist/local/' + pkg.name},
{src: 'assets/nomodule.js', dest: 'dist/local/' + pkg.name}, {src: 'assets/nomodule.js', dest: 'dist/local/' + pkg.name},
{src: await getPackagePath('dbp-common', 'assets/icons/*.svg'), dest: 'dist/local/dbp-common/icons'}, {src: await getPackagePath('@dbp-toolkit/common', 'assets/icons/*.svg'), dest: 'dist/local/dbp-common/icons'},
{src: await getPackagePath('datatables.net-dt', 'css'), dest: 'dist/local/dbp-data-table-view'}, {src: await getPackagePath('datatables.net-dt', 'css'), dest: 'dist/local/dbp-data-table-view'},
{src: await getPackagePath('datatables.net-dt', 'images'), dest: 'dist/local/dbp-data-table-view'}, {src: await getPackagePath('datatables.net-dt', 'images'), dest: 'dist/local/dbp-data-table-view'},
{src: await getPackagePath('datatables.net-responsive-dt', 'css'), dest: 'dist/local/dbp-data-table-view'}, {src: await getPackagePath('datatables.net-responsive-dt', 'css'), dest: 'dist/local/dbp-data-table-view'},
......
...@@ -11,9 +11,9 @@ import {i18n} from './i18n'; ...@@ -11,9 +11,9 @@ import {i18n} from './i18n';
import {css, html, LitElement, unsafeCSS} from 'lit-element'; import {css, html, LitElement, unsafeCSS} from 'lit-element';
import de from '../assets/datatables/i18n/German'; import de from '../assets/datatables/i18n/German';
import en from '../assets/datatables/i18n/English'; import en from '../assets/datatables/i18n/English';
import {getIconSVGURL} from 'dbp-common'; import {getIconSVGURL} from '@dbp-toolkit/common';
import * as commonUtils from 'dbp-common/utils'; import * as commonUtils from '@dbp-toolkit/common/utils';
import * as commonStyles from 'dbp-common/styles'; import * as commonStyles from '@dbp-toolkit/common/styles';
dt(window, $); dt(window, $);
resp(window, $); resp(window, $);
......
import {AuthKeycloak, LoginButton} from 'dbp-auth'; import {AuthKeycloak, LoginButton} from '@dbp-toolkit/auth';
import {DataTableView} from './data-table-view.js'; import {DataTableView} from './data-table-view.js';
import {i18n} from './i18n'; import {i18n} from './i18n';
import {css, html, LitElement} from 'lit-element'; import {css, html, LitElement} from 'lit-element';
import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import {ScopedElementsMixin} from '@open-wc/scoped-elements';
import * as commonUtils from 'dbp-common/utils'; import * as commonUtils from '@dbp-toolkit/common/utils';
import * as commonStyles from 'dbp-common/styles'; import * as commonStyles from '@dbp-toolkit/common/styles';
class DataTableViewDemo extends ScopedElementsMixin(LitElement) { class DataTableViewDemo extends ScopedElementsMixin(LitElement) {
constructor() { constructor() {
......
import * as commonUtils from 'dbp-common/utils'; import * as commonUtils from '@dbp-toolkit/common/utils';
import {DataTableView} from './data-table-view.js'; import {DataTableView} from './data-table-view.js';
commonUtils.defineCustomElement('dbp-data-table-view', DataTableView); commonUtils.defineCustomElement('dbp-data-table-view', DataTableView);
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment