diff --git a/assets/.htaccess.ejs b/assets/.htaccess.ejs index 321058f0549f4bb0a6533ab612b6bd4f5472302e..0d7d30250dbaf85ede7f12e23165865c5ee1f5de 100644 --- a/assets/.htaccess.ejs +++ b/assets/.htaccess.ejs @@ -1,6 +1,6 @@ -DirectoryIndex <%= geturl('vpu-signature.html') %> +DirectoryIndex <%= getUrl('vpu-signature.html') %> <FilesMatch "^(de|en|)$"> - FallbackResource <%= geturl('vpu-signature.html') %> + FallbackResource <%= getUrl('vpu-signature.html') %> </FilesMatch> Header set Cache-Control "must-revalidate, max-age=60" diff --git a/assets/vpu-signature.html.ejs b/assets/vpu-signature.html.ejs index b8a5af5c7df26e66f16c72344c2fddcef113e327..baaa478a034ab31408f1bb9b9d26be5fb0bffdaa 100644 --- a/assets/vpu-signature.html.ejs +++ b/assets/vpu-signature.html.ejs @@ -5,8 +5,8 @@ <meta name="viewport" content="width=device-width, initial-scale=1"> <!-- Favicons --> - <link rel="shortcut icon" type="image/x-icon" href="<%= getprivateurl('favicon.ico') %>"> - <link rel="icon" type="image/svg+xml" href="<%= getprivateurl('favicon.svg') %>" sizes="any"> + <link rel="shortcut icon" type="image/x-icon" href="<%= getPrivateUrl('favicon.ico') %>"> + <link rel="icon" type="image/svg+xml" href="<%= getPrivateUrl('favicon.svg') %>" sizes="any"> <% if (environment === "local") { -%> <!-- XXX: Disable adoptedStyleSheets so that lit-element doesn't use it and we can edit CSS in the Chrome dev tools --> @@ -16,30 +16,30 @@ <% } -%> <!-- PWA manfiest file --> - <link rel="manifest" href="<%= geturl(name + '.manifest.json') %>"> + <link rel="manifest" href="<%= getUrl(name + '.manifest.json') %>"> <!-- Loading spinner --> <script type="module"> - import {Spinner} from '<%= getprivateurl('spinner.js') %>'; + import {Spinner} from '<%= getPrivateUrl('spinner.js') %>'; customElements.define('vpu-loading-spinner', Spinner); </script> <!-- App bundles--> - <script type="module" src="<%= geturl(name + '.js') %>"></script> + <script type="module" src="<%= getUrl(name + '.js') %>"></script> <!-- Prevent Chrome/Edge from suggesting to translate the page --> <meta name="google" content="notranslate"> <!-- Preload fonts --> - <link rel="preload" href="<%= getprivateurl('fonts/SourceSansPro-Light.otf.woff2') %>" as="font" type="font/woff2" crossorigin> - <link rel="preload" href="<%= getprivateurl('fonts/SourceSansPro-Regular.otf.woff2') %>" as="font" type="font/woff2" crossorigin> - <link rel="preload" href="<%= getprivateurl('fonts/SourceSansPro-Semibold.otf.woff2') %>" as="font" type="font/woff2" crossorigin> - <link rel="preload" href="<%= getprivateurl('fonts/SourceSansPro-Bold.otf.woff2') %>" as="font" type="font/woff2" crossorigin> + <link rel="preload" href="<%= getPrivateUrl('fonts/SourceSansPro-Light.otf.woff2') %>" as="font" type="font/woff2" crossorigin> + <link rel="preload" href="<%= getPrivateUrl('fonts/SourceSansPro-Regular.otf.woff2') %>" as="font" type="font/woff2" crossorigin> + <link rel="preload" href="<%= getPrivateUrl('fonts/SourceSansPro-Semibold.otf.woff2') %>" as="font" type="font/woff2" crossorigin> + <link rel="preload" href="<%= getPrivateUrl('fonts/SourceSansPro-Bold.otf.woff2') %>" as="font" type="font/woff2" crossorigin> <!-- Matomo --> <script type="text/javascript"> var _paq = window._paq || []; - _paq.push(['setCustomVariable', 1, "GitCommit", "<%= buildinfo.info %>", "visit"]); + _paq.push(['setCustomVariable', 1, "GitCommit", "<%= buildInfo.info %>", "visit"]); _paq.push(['enableHeartBeatTimer']); _paq.push(['disableCookies']); _paq.push(['trackPageView']); @@ -86,28 +86,28 @@ @font-face { font-family: 'Source Sans Pro'; font-weight: 300; - src: url('<%= getprivateurl('fonts/SourceSansPro-Light.otf.woff2') %>') format('woff2'); + src: url('<%= getPrivateUrl('fonts/SourceSansPro-Light.otf.woff2') %>') format('woff2'); font-display: block; } @font-face { font-family: 'Source Sans Pro'; font-weight: 400; - src: url('<%= getprivateurl('fonts/SourceSansPro-Regular.otf.woff2') %>') format('woff2'); + src: url('<%= getPrivateUrl('fonts/SourceSansPro-Regular.otf.woff2') %>') format('woff2'); font-display: block; } @font-face { font-family: 'Source Sans Pro'; font-weight: 600; - src: url('<%= getprivateurl('fonts/SourceSansPro-Semibold.otf.woff2') %>') format('woff2'); + src: url('<%= getPrivateUrl('fonts/SourceSansPro-Semibold.otf.woff2') %>') format('woff2'); font-display: block; } @font-face { font-family: 'Source Sans Pro'; font-weight: 700; - src: url('<%= getprivateurl('fonts/SourceSansPro-Bold.otf.woff2') %>') format('woff2'); + src: url('<%= getPrivateUrl('fonts/SourceSansPro-Bold.otf.woff2') %>') format('woff2'); font-display: block; } @@ -131,14 +131,14 @@ <body> <<%= name %> lang="de" - src="<%= geturl(name + '.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') %>"}' + base-path="<%= getUrl('') %>" + keycloak-config='{"url": "<%= keyCloakBaseURL %>", "realm": "tugraz", "clientId": "<%= keyCloakClientId %>", "silentCheckSsoRedirectUri": "<%= getUrl('silent-check-sso.html') %>"}' ><vpu-loading-spinner></vpu-loading-spinner></<%= name %>> <!-- Error handling for too old browsers --> -<script src="<%= getprivateurl('browser-check.js') %>" defer></script> +<script src="<%= getPrivateUrl('browser-check.js') %>" defer></script> <noscript>Diese Applikation benötigt Javascript / This application requires Javascript</noscript> </body> </html> \ No newline at end of file diff --git a/rollup.config.js b/rollup.config.js index 5cb8f8c0c518aa000fda8b3af5a9fdfc9acbacce..e41f0b48389dfaaf95298fb0f08141d2a85ff60c 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -209,10 +209,10 @@ export default { src: 'assets', include: ['**/*.ejs', '**/.*.ejs'], data: { - geturl: (p) => { + getUrl: (p) => { return url.resolve(basePath, p); }, - getprivateurl: (p) => { + getPrivateUrl: (p) => { return url.resolve(`${basePath}local/${pkg.name}/`, p); }, name: pkg.name, @@ -223,7 +223,7 @@ export default { pdfAsQualifiedlySigningServer: pdfAsQualifiedlySigningServer, environment: build, matomoSiteId: matomoSiteId, - buildinfo: getBuildInfo() + buildInfo: getBuildInfo() } }), resolve({