From ec225219cd65a803c8997bd762b06ee38b375775 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Tue, 19 May 2020 14:37:39 +0200
Subject: [PATCH] Completely remove the app name from the main template
---
assets/vpu-signature.html.ejs | 10 +++++-----
rollup.config.js | 3 ++-
src/vpu-signature.js | 2 +-
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/assets/vpu-signature.html.ejs b/assets/vpu-signature.html.ejs
index 27bb4b8..b8a5af5 100644
--- 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>
diff --git a/rollup.config.js b/rollup.config.js
index 122407d..5cb8f8c 100644
--- 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,
diff --git a/src/vpu-signature.js b/src/vpu-signature.js
index c9a1eda..638b7ff 100644
--- a/src/vpu-signature.js
+++ b/src/vpu-signature.js
@@ -1,4 +1,4 @@
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
--
GitLab