Remove enclosing provider

1bb97438 · Bekerle, Patrizio · eb31e7a2 · 1bb97438 · 1bb97438
Unverified Commit 1bb97438 authored 4 years ago by Bekerle, Patrizio
--- a/toolkit-showcase/assets/dbp-toolkit-showcase.html.ejs
+++ b/toolkit-showcase/assets/dbp-toolkit-showcase.html.ejs
@@ -53,29 +53,26 @@
 </head>

 <body>
-<dbp-provider id="root"
-              lang="de"
-              entry-point-url="<%= entryPointURL %>"
-              nextcloud-auth-url="<%= nextcloudWebAppPasswordURL %>"
-              nextcloud-web-dav-url="<%= nextcloudWebDavURL %>"
-              nextcloud-name="<%= nextcloudName %>"
-              nextcloud-file-url="<%= nextcloudFileURL %>">
-    <<%= name %>
-        src="<%= getUrl(name + '.topic.metadata.json') %>"
-        subscribe="lang,entry-point-url"
-        auth
-        requested-login-status
-        analytics-event
-        lang="en"
-        base-path="<%= getUrl('') %>"
-        keycloak-config='{"url": "<%= keyCloakBaseURL %>", "realm": "tugraz", "clientId": "<%= keyCloakClientId %>", "silentCheckSsoRedirectUri": "<%= getUrl('silent-check-sso.html') %>"}'
-        matomo-url="<%= matomoUrl %>" matomo-site-id="<%= matomoSiteId %>"
-        git-info='<%= buildInfo.info %>'
-        build-url='<%= buildInfo.url %>'
-        build-time='<%= buildInfo.time %>'
-        env='<%= buildInfo.env %>'
-    ><dbp-loading-spinner></dbp-loading-spinner></<%= name %>>
-</dbp-provider>
+<<%= name %>
+    lang="de"
+    entry-point-url="<%= entryPointURL %>"
+    nextcloud-auth-url="<%= nextcloudWebAppPasswordURL %>"
+    nextcloud-web-dav-url="<%= nextcloudWebDavURL %>"
+    nextcloud-name="<%= nextcloudName %>"
+    nextcloud-file-url="<%= nextcloudFileURL %>"
+    src="<%= getUrl(name + '.topic.metadata.json') %>"
+    auth
+    requested-login-status
+    analytics-event
+    lang="en"
+    base-path="<%= getUrl('') %>"
+    keycloak-config='{"url": "<%= keyCloakBaseURL %>", "realm": "tugraz", "clientId": "<%= keyCloakClientId %>", "silentCheckSsoRedirectUri": "<%= getUrl('silent-check-sso.html') %>"}'
+    matomo-url="<%= matomoUrl %>" matomo-site-id="<%= matomoSiteId %>"
+    git-info='<%= buildInfo.info %>'
+    build-url='<%= buildInfo.url %>'
+    build-time='<%= buildInfo.time %>'
+    env='<%= buildInfo.env %>'
+><dbp-loading-spinner></dbp-loading-spinner></<%= name %>>

 <!-- Error handling for too old browsers -->
 <script src="<%= getPrivateUrl('browser-check.js') %>" defer></script>

--- a/toolkit-showcase/src/dbp-toolkit-showcase.js
+++ b/toolkit-showcase/src/dbp-toolkit-showcase.js
 import {AppShell} from '@dbp-toolkit/app-shell';
 import * as commonUtils from '@dbp-toolkit/common/utils';
-import {Provider} from '@dbp-toolkit/provider';

-// It's important that the Provider is created before the AppShell, so the AppShell can subscribe to the Provider
-commonUtils.defineCustomElement('dbp-provider', Provider);
 commonUtils.defineCustomElement('dbp-toolkit-showcase', AppShell);