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

Clean up ejs template variable naming

parent ec225219
No related branches found
No related tags found
No related merge requests found
Pipeline #11203 passed
Stage: test
Stage: deploy
Hide whitespace changes
Inline Side-by-side
assets/.htaccess.ejs
+ 2
− 2
View file @ f42ccaa2
DirectoryIndex <%= geturl('vpu-signature.html') %> DirectoryIndex <%= getUrl('vpu-signature.html') %>
<FilesMatch "^(de|en|)$"> <FilesMatch "^(de|en|)$">
FallbackResource <%= geturl('vpu-signature.html') %> FallbackResource <%= getUrl('vpu-signature.html') %>
</FilesMatch> </FilesMatch>
Header set Cache-Control "must-revalidate, max-age=60" Header set Cache-Control "must-revalidate, max-age=60"
......
assets/vpu-signature.html.ejs
+ 18
− 18
View file @ f42ccaa2
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<!-- Favicons --> <!-- Favicons -->
<link rel="shortcut icon" type="image/x-icon" href="<%= getprivateurl('favicon.ico') %>"> <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="icon" type="image/svg+xml" href="<%= getPrivateUrl('favicon.svg') %>" sizes="any">
<% if (environment === "local") { -%> <% if (environment === "local") { -%>
<!-- XXX: Disable adoptedStyleSheets so that lit-element doesn't use it and we can edit CSS in the Chrome dev tools --> <!-- 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 @@ ...@@ -16,30 +16,30 @@
<% } -%> <% } -%>
<!-- PWA manfiest file --> <!-- PWA manfiest file -->
<link rel="manifest" href="<%= geturl(name + '.manifest.json') %>"> <link rel="manifest" href="<%= getUrl(name + '.manifest.json') %>">
<!-- Loading spinner --> <!-- Loading spinner -->
<script type="module"> <script type="module">
import {Spinner} from '<%= getprivateurl('spinner.js') %>'; import {Spinner} from '<%= getPrivateUrl('spinner.js') %>';
customElements.define('vpu-loading-spinner', Spinner); customElements.define('vpu-loading-spinner', Spinner);
</script> </script>
<!-- App bundles--> <!-- 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 --> <!-- Prevent Chrome/Edge from suggesting to translate the page -->
<meta name="google" content="notranslate"> <meta name="google" content="notranslate">
<!-- Preload fonts --> <!-- 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-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-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-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-Bold.otf.woff2') %>" as="font" type="font/woff2" crossorigin>
<!-- Matomo --> <!-- Matomo -->
<script type="text/javascript"> <script type="text/javascript">
var _paq = window._paq || []; 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(['enableHeartBeatTimer']);
_paq.push(['disableCookies']); _paq.push(['disableCookies']);
_paq.push(['trackPageView']); _paq.push(['trackPageView']);
...@@ -86,28 +86,28 @@ ...@@ -86,28 +86,28 @@
@font-face { @font-face {
font-family: 'Source Sans Pro'; font-family: 'Source Sans Pro';
font-weight: 300; 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-display: block;
} }
@font-face { @font-face {
font-family: 'Source Sans Pro'; font-family: 'Source Sans Pro';
font-weight: 400; 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-display: block;
} }
@font-face { @font-face {
font-family: 'Source Sans Pro'; font-family: 'Source Sans Pro';
font-weight: 600; 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-display: block;
} }
@font-face { @font-face {
font-family: 'Source Sans Pro'; font-family: 'Source Sans Pro';
font-weight: 700; 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; font-display: block;
} }
...@@ -131,14 +131,14 @@ ...@@ -131,14 +131,14 @@
<body> <body>
<<%= name %> <<%= name %>
lang="de" lang="de"
src="<%= geturl(name + '.topic.metadata.json') %>" src="<%= getUrl(name + '.topic.metadata.json') %>"
entry-point-url="<%= entryPointURL %>" entry-point-url="<%= entryPointURL %>"
base-path="<%= geturl('') %>" base-path="<%= getUrl('') %>"
keycloak-config='{"url": "<%= keyCloakBaseURL %>", "realm": "tugraz", "clientId": "<%= keyCloakClientId %>", "silentCheckSsoRedirectUri": "<%= geturl('silent-check-sso.html') %>"}' keycloak-config='{"url": "<%= keyCloakBaseURL %>", "realm": "tugraz", "clientId": "<%= keyCloakClientId %>", "silentCheckSsoRedirectUri": "<%= getUrl('silent-check-sso.html') %>"}'
><vpu-loading-spinner></vpu-loading-spinner></<%= name %>> ><vpu-loading-spinner></vpu-loading-spinner></<%= name %>>
<!-- Error handling for too old browsers --> <!-- 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> <noscript>Diese Applikation benötigt Javascript / This application requires Javascript</noscript>
</body> </body>
</html> </html>
\ No newline at end of file
rollup.config.js
+ 3
− 3
View file @ f42ccaa2
...@@ -209,10 +209,10 @@ export default { ...@@ -209,10 +209,10 @@ export default {
src: 'assets', src: 'assets',
include: ['**/*.ejs', '**/.*.ejs'], include: ['**/*.ejs', '**/.*.ejs'],
data: { data: {
geturl: (p) => { getUrl: (p) => {
return url.resolve(basePath, p); return url.resolve(basePath, p);
}, },
getprivateurl: (p) => { getPrivateUrl: (p) => {
return url.resolve(`${basePath}local/${pkg.name}/`, p); return url.resolve(`${basePath}local/${pkg.name}/`, p);
}, },
name: pkg.name, name: pkg.name,
...@@ -223,7 +223,7 @@ export default { ...@@ -223,7 +223,7 @@ export default {
pdfAsQualifiedlySigningServer: pdfAsQualifiedlySigningServer, pdfAsQualifiedlySigningServer: pdfAsQualifiedlySigningServer,
environment: build, environment: build,
matomoSiteId: matomoSiteId, matomoSiteId: matomoSiteId,
buildinfo: getBuildInfo() buildInfo: getBuildInfo()
} }
}), }),
resolve({ resolve({
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment