Completely remove the app name from the main template

ec225219 · Reiter, Christoph · f9bf27ec · ec225219 · ec225219 · ec225219
Commit ec225219 authored 5 years ago by Reiter, Christoph
--- a/assets/vpu-signature.html.ejs
+++ b/assets/vpu-signature.html.ejs
@@ -16,7 +16,7 @@
 <% } -%>

    <!-- PWA manfiest file -->
-    <link rel="manifest" href="<%= geturl('vpu-signature.manifest.json') %>">
+    <link rel="manifest" href="<%= geturl(name + '.manifest.json') %>">

    <!-- Loading spinner -->
    <script type="module">
@@ -25,7 +25,7 @@
    </script>

    <!-- App bundles-->
-    <script type="module" src="<%= geturl('vpu-signature.js') %>"></script>
+    <script type="module" src="<%= geturl(name + '.js') %>"></script>

    <!-- Prevent Chrome/Edge from suggesting to translate the page -->
    <meta name="google" content="notranslate">
@@ -129,13 +129,13 @@
 </head>

 <body>
-<vpu-app-signature
+<<%= name %>
    lang="de"
-    src="<%= geturl('vpu-signature.topic.metadata.json') %>"
+    src="<%= geturl(name + '.topic.metadata.json') %>"
    entry-point-url="<%= entryPointURL %>"
    base-path="<%= geturl('') %>"
    keycloak-config='{"url": "<%= keyCloakBaseURL %>", "realm": "tugraz", "clientId": "<%= keyCloakClientId %>", "silentCheckSsoRedirectUri": "<%= geturl('silent-check-sso.html') %>"}'
-><vpu-loading-spinner></vpu-loading-spinner></vpu-app-signature>
+><vpu-loading-spinner></vpu-loading-spinner></<%= name %>>

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

--- a/rollup.config.js
+++ b/rollup.config.js
@@ -164,7 +164,7 @@ function getBuildInfo() {

 export default {
    input: (build != 'test') ? [
-      'src/vpu-signature.js',
+      'src/' + pkg.name + '.js',
      'src/vpu-official-signature-pdf-upload.js',
      'src/vpu-qualified-signature-pdf-upload.js',
    ] : glob.sync('test/**/*.js'),
@@ -215,6 +215,7 @@ export default {
            getprivateurl: (p) => {
                return url.resolve(`${basePath}local/${pkg.name}/`, p);
            },
+            name: pkg.name,
            entryPointURL: entryPointURL,
            keyCloakServer: keyCloakServer,
            keyCloakBaseURL: keyCloakBaseURL,

--- a/src/vpu-signature.js
+++ b/src/vpu-signature.js
 import {AppShell} from 'vpu-app-shell';
 import * as commonUtils from 'vpu-common/utils';

-commonUtils.defineCustomElement('vpu-app-signature', AppShell);
\ No newline at end of file
+commonUtils.defineCustomElement('vpu-signature', AppShell);
\ No newline at end of file