Skip to content
Snippets Groups Projects
Commit a1eb87ac authored by Reiter, Christoph's avatar Reiter, Christoph :snake:
Browse files

Update auth/common

parent 1b2b4a14
No related branches found
No related tags found
No related merge requests found
...@@ -316,10 +316,9 @@ export class DataTableView extends LitElement { ...@@ -316,10 +316,9 @@ export class DataTableView extends LitElement {
} }
render() { render() {
commonUtils.initAssetBaseURL('vpu-data-table-view-src'); let dt_css = commonUtils.getAssetURL('vpu-data-table-view', 'css/jquery.dataTables.min.css');
let dt_css = commonUtils.getAssetURL('local/vpu-data-table-view/css/jquery.dataTables.min.css'); let rs_css = commonUtils.getAssetURL('vpu-data-table-view', 'css/responsive.dataTables.min.css');
let rs_css = commonUtils.getAssetURL('local/vpu-data-table-view/css/responsive.dataTables.min.css'); let bt_css = commonUtils.getAssetURL('vpu-data-table-view', 'css/buttons.dataTables.min.css');
let bt_css = commonUtils.getAssetURL('local/vpu-data-table-view/css/buttons.dataTables.min.css');
return html` return html`
<link rel="stylesheet" href="${dt_css}"> <link rel="stylesheet" href="${dt_css}">
......
import {Auth} from 'vpu-auth'; import {AuthKeycloak, LoginButton} from 'vpu-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';
...@@ -16,7 +16,8 @@ class DataTableViewDemo extends ScopedElementsMixin(LitElement) { ...@@ -16,7 +16,8 @@ class DataTableViewDemo extends ScopedElementsMixin(LitElement) {
static get scopedElements() { static get scopedElements() {
return { return {
'vpu-data-table-view': DataTableView, 'vpu-data-table-view': DataTableView,
'vpu-auth': Auth, 'vpu-auth-keycloak': AuthKeycloak,
'vpu-login-button': LoginButton,
}; };
} }
...@@ -136,7 +137,8 @@ class DataTableViewDemo extends ScopedElementsMixin(LitElement) { ...@@ -136,7 +137,8 @@ class DataTableViewDemo extends ScopedElementsMixin(LitElement) {
getAuthComponentHtml() { getAuthComponentHtml() {
return this.noAuth ? html`` : html` return this.noAuth ? html`` : html`
<div class="content"> <div class="content">
<vpu-auth lang="${this.lang}" client-id="${commonUtils.setting('keyCloakClientId')}" load-person></vpu-auth> <vpu-auth-keycloak lang="${this.lang}" url="https://auth-dev.tugraz.at/auth" realm="tugraz" client-id="auth-dev-mw-frontend-local" load-person try-login></vpu-auth-keycloak>
<vpu-login-button lang="${this.lang}" show-image></vpu-login-button>
</div> </div>
`; `;
} }
...@@ -151,8 +153,6 @@ class DataTableViewDemo extends ScopedElementsMixin(LitElement) { ...@@ -151,8 +153,6 @@ class DataTableViewDemo extends ScopedElementsMixin(LitElement) {
} }
render() { render() {
commonUtils.initAssetBaseURL('vpu-data-table-view-src');
return html` return html`
<style> <style>
.box { .box {
......
auth @ 39d0e356
Subproject commit b9fbe487a8a6117ae90a423a8ba318a0321bf51b Subproject commit 39d0e356c029e0f2e92233520660ce307d0741d5
common @ 63b49c3a
Subproject commit 9c6dc1fd5e004eba32e31adf8e4485a26c345fe0 Subproject commit 63b49c3a2eeae312b4a2aeec4cc2f7f0ee12b749
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment