diff --git a/packages/knowledge-base-web-page-element-view/rollup.config.js b/packages/knowledge-base-web-page-element-view/rollup.config.js
index 3c158bf990c55606f8df0e89caae51b0bf74aa97..5b589a6b53e7c67349edfa64b3fa0586829a4882 100644
--- a/packages/knowledge-base-web-page-element-view/rollup.config.js
+++ b/packages/knowledge-base-web-page-element-view/rollup.config.js
@@ -20,7 +20,9 @@ export default {
plugins: [
multiEntry(),
resolve(),
- commonjs(),
+ commonjs({
+ include: 'node_modules/**'
+ }),
json(),
replace({
"process.env.BUILD": '"' + build + '"',
diff --git a/packages/knowledge-base-web-page-element-view/src/demo.js b/packages/knowledge-base-web-page-element-view/src/demo.js
index 64c79e967e1ebb5354733994a19c218c62115a3c..75358bb336418b49e208d6c4639c4c0bce9652ba 100644
--- a/packages/knowledge-base-web-page-element-view/src/demo.js
+++ b/packages/knowledge-base-web-page-element-view/src/demo.js
@@ -1,6 +1,6 @@
import 'vpu-auth';
import './vpu-kb-wpe-view.js';
-import utils from './utils.js';
+import {setting, getAPiUrl} from './utils.js';
import {i18n} from './i18n';
import {html, LitElement} from 'lit-element';
import commonUtils from 'vpu-common/utils';
@@ -38,17 +38,17 @@ class KnowledgeBaseWebPageElementViewDemo extends LitElement {
<h1 class="title">KnowledgeBaseWebPageElementView-Demo</h1>
</div>
<div class="content">
- <vpu-auth lang="${this.lang}" client-id="${utils.setting('keyCloakClientId')}" load-person force-login></vpu-auth>
+ <vpu-auth lang="${this.lang}" client-id="${setting('keyCloakClientId')}" load-person force-login></vpu-auth>
</div>
<div class="content">
<h2 class="subtitle">Deutsch</h2>
<p>Ein erster Schritt</p>
- <vpu-knowledge-base-web-page-element-view lang="de" entry-point-url="${utils.getAPiUrl()}" value="bedienstete/bibliothek/buch-ausleihen" text="Ein Buch ausleihen"></vpu-knowledge-base-web-page-element-view>
+ <vpu-knowledge-base-web-page-element-view lang="de" entry-point-url="${getAPiUrl()}" value="bedienstete/bibliothek/buch-ausleihen" text="Ein Buch ausleihen"></vpu-knowledge-base-web-page-element-view>
</div>
<div class="content">
<h2 class="subtitle">Englisch</h2>
<p>A first step</p>
- <vpu-knowledge-base-web-page-element-view lang="en" entry-point-url="${utils.getAPiUrl()}" value="bedienstete/bibliothek/buch-ausleihen" text="Borrow a book"></vpu-knowledge-base-web-page-element-view>
+ <vpu-knowledge-base-web-page-element-view lang="en" entry-point-url="${getAPiUrl()}" value="bedienstete/bibliothek/buch-ausleihen" text="Borrow a book"></vpu-knowledge-base-web-page-element-view>
</div>
<hr>
<div class="content">
diff --git a/packages/knowledge-base-web-page-element-view/src/utils.js b/packages/knowledge-base-web-page-element-view/src/utils.js
index d0c0bcf67c2c2e33e4a2013aa3cc84129e34b967..4acd06520f27d607941ebf4fa399bab6987f5525 100644
--- a/packages/knowledge-base-web-page-element-view/src/utils.js
+++ b/packages/knowledge-base-web-page-element-view/src/utils.js
@@ -1,15 +1,13 @@
-const vars = require("./vars");
+import vars from './vars.js';
-module.exports = {
- getAPiUrl: function(path = "", withPrefix = true) {
+export const getAPiUrl = function(path = "", withPrefix = true) {
return vars.apiBaseUrl + (withPrefix ? vars.apiUrlPrefix : "") + path;
- },
+}
- /**
- * Reads a setting
- *
- * @param key
- * @returns {*}
- */
- setting: (key) => vars[key]
-};
+/**
+ * Reads a setting
+ *
+ * @param key
+ * @returns {*}
+ */
+export const setting = (key) => vars[key]
diff --git a/packages/knowledge-base-web-page-element-view/src/vars.js b/packages/knowledge-base-web-page-element-view/src/vars.js
index d34d7b63f23d553f51165f12d8cffa61c87865f1..0e25edd8790c49edf590d995c992267aa2f11926 100644
--- a/packages/knowledge-base-web-page-element-view/src/vars.js
+++ b/packages/knowledge-base-web-page-element-view/src/vars.js
@@ -1,7 +1,8 @@
+var config;
switch(process.env.BUILD) {
case "development":
- module.exports = {
+ config = {
apiBaseUrl: 'https://mw-dev.tugraz.at',
apiUrlPrefix: '',
keyCloakClientId: 'auth-dev-mw-frontend',
@@ -9,14 +10,14 @@ switch(process.env.BUILD) {
break;
case "production":
- module.exports = {
+ config = {
apiBaseUrl: 'https://mw.tugraz.at',
apiUrlPrefix: '',
keyCloakClientId: 'auth-prod-mw-frontend',
};
break;
case "demo":
- module.exports = {
+ config = {
apiBaseUrl: 'https://api-demo.tugraz.at',
apiUrlPrefix: '',
keyCloakClientId: 'auth-dev-mw-frontend',
@@ -24,9 +25,11 @@ switch(process.env.BUILD) {
break;
case "local":
default:
- module.exports = {
+ config = {
apiBaseUrl: 'http://127.0.0.1:8000',
apiUrlPrefix: '',
keyCloakClientId: 'auth-dev-mw-frontend-local',
};
}
+
+export default config;
diff --git a/packages/knowledge-base-web-page-element-view/src/vpu-kb-wpe-view.js b/packages/knowledge-base-web-page-element-view/src/vpu-kb-wpe-view.js
index 172fc11ab79a4ec0f67c791a6b55659a2888b048..eb05d4b5de2b08dff970b9b83b462f024150b243 100644
--- a/packages/knowledge-base-web-page-element-view/src/vpu-kb-wpe-view.js
+++ b/packages/knowledge-base-web-page-element-view/src/vpu-kb-wpe-view.js
@@ -2,7 +2,7 @@ import {i18n} from './i18n';
import {html} from 'lit-element';
// import JSONLD from 'vpu-common/jsonld';
import VPULitElement from 'vpu-common/vpu-lit-element'
-import utils from "./utils";
+import {getAPiUrl} from "./utils";
import commonUtils from "vpu-common/utils";
import {unsafeHTML} from 'lit-html/directives/unsafe-html.js';
@@ -15,7 +15,7 @@ class VPUKnowledgeBaseWebPageElementView extends VPULitElement {
this.lang = 'de';
this.value = '';
this.html = '';
- this.entryPointUrl = utils.getAPiUrl();
+ this.entryPointUrl = getAPiUrl();
this.error = '';
this.eyeClose = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAA1ElEQVQ4ja3SMU5CURCF4c+ejpiILe5DZAGyASuJS5CKEoMGKhdAwWKgMkriKjQWFkAkBizgmckNPEgeJ7nVuee/M3eGI2mCehFAHZ/Hgtygizd84wsjPOHsEMgUqx1njvtd4R7uAmSIMipo4SeAHtLwdTCbG8gHLsOdVlJN9LwEY4nSFsh5AhhHwGtinoY/ySDlPEAjMbvByyDDvBbgOZi/eNxUkrUTp9NJw3CCNhbJS0vcBshgWzjqAn28W899Zr1U1dBObR8kT9nGXhWFTIoA/vUHQydS/iUcHx4AAAAASUVORK5CYII=';
this.eyeOpen = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAA5UlEQVQ4jc3SvS7EURAF8B+JioSsCokHUFgNiWewQqvzICRew2v4WLFUnoNS/msrazUaFOYm12RlVeIkk9ycM2fmztzLf8U02tiPaAc3EbM4Rh8fKfo4wdxP5nXcV4YhLnGO54p/wEY2b6akHhYqfR7dVHyriMt4qsQRWtiNaw+wFwWHaaQlcc161l4UblIyXKTcM7hL5FUk14tsgsvNumIhb2NG6ISxiXMrtJI3wErZwyHeK/E2DAWLuKn0F2xLOEgdRriOeK34sc9YsIpT37dd4hFHvj7bRMxElw52sIap3xj/Hp9rzGFBhiMSxAAAAABJRU5ErkJggg==';
diff --git a/packages/knowledge-base-web-page-element-view/vendor/auth b/packages/knowledge-base-web-page-element-view/vendor/auth
index 0daf533bbdca1bcb5b8f5d16bb258b86bdb59242..2752cf0ce9d1710792cc939f8b26f48641693516 160000
--- a/packages/knowledge-base-web-page-element-view/vendor/auth
+++ b/packages/knowledge-base-web-page-element-view/vendor/auth
@@ -1 +1 @@
-Subproject commit 0daf533bbdca1bcb5b8f5d16bb258b86bdb59242
+Subproject commit 2752cf0ce9d1710792cc939f8b26f48641693516
diff --git a/packages/knowledge-base-web-page-element-view/vendor/common b/packages/knowledge-base-web-page-element-view/vendor/common
index 68e0a4f1f1a3ef6e05aca5216bf8684578ec2229..b30eaa6475ccc65b5f99d2ead86ddbe2b8e015a7 160000
--- a/packages/knowledge-base-web-page-element-view/vendor/common
+++ b/packages/knowledge-base-web-page-element-view/vendor/common
@@ -1 +1 @@
-Subproject commit 68e0a4f1f1a3ef6e05aca5216bf8684578ec2229
+Subproject commit b30eaa6475ccc65b5f99d2ead86ddbe2b8e015a7