From b5a4257e5d0f3499b9df3872b00f1eefcd3a26d5 Mon Sep 17 00:00:00 2001
From: Patrizio Bekerle <patrizio@bekerle.com>
Date: Tue, 22 Jun 2021 11:51:24 +0200
Subject: [PATCH] Remove nextcloudAuthInfoDE and nextcloudAuthInfoEN and
directly embed text
---
app.config.js | 13 -------------
assets/dbp-signature.html.ejs | 4 ++--
rollup.config.js | 4 ----
vendor/toolkit | 2 +-
4 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/app.config.js b/app.config.js
index df3d7d2..18ec963 100644
--- a/app.config.js
+++ b/app.config.js
@@ -1,6 +1,3 @@
-const nextcloudAuthInfoDE = 'Für diese Funktion ist ein TU Graz Bediensteten Account nötig!';
-const nextcloudAuthInfoEN = 'A TU Graz employee account is required for this function!';
-
export default {
local: {
basePath: '/dist/',
@@ -11,8 +8,6 @@ export default {
matomoSiteId: 131,
nextcloudBaseURL: 'http://localhost:8081',
nextcloudName: 'TU Graz cloud',
- nextcloudAuthInfoDE: nextcloudAuthInfoDE,
- nextcloudAuthInfoEN: nextcloudAuthInfoEN,
pdfAsQualifiedlySigningServer: 'https://sig-dev.tugraz.at',
hiddenActivities: ['dbp-signature-verification-full']
},
@@ -25,8 +20,6 @@ export default {
matomoSiteId: 131,
nextcloudBaseURL: 'http://bs-local.com:8081',
nextcloudName: 'TU Graz cloud',
- nextcloudAuthInfoDE: nextcloudAuthInfoDE,
- nextcloudAuthInfoEN: nextcloudAuthInfoEN,
pdfAsQualifiedlySigningServer: 'https://sig-dev.tugraz.at',
hiddenActivities: []
},
@@ -39,8 +32,6 @@ export default {
matomoSiteId: 131,
nextcloudBaseURL: 'https://nc-dev.tugraz.at/pers',
nextcloudName: 'TU Graz cloud',
- nextcloudAuthInfoDE: nextcloudAuthInfoDE,
- nextcloudAuthInfoEN: nextcloudAuthInfoEN,
pdfAsQualifiedlySigningServer: 'https://sig-dev.tugraz.at',
hiddenActivities: ['dbp-signature-verification-full']
},
@@ -53,8 +44,6 @@ export default {
matomoSiteId: 131,
nextcloudBaseURL: 'https://cloud.tugraz.at',
nextcloudName: 'TU Graz cloud',
- nextcloudAuthInfoDE: nextcloudAuthInfoDE,
- nextcloudAuthInfoEN: nextcloudAuthInfoEN,
pdfAsQualifiedlySigningServer: 'https://sig-test.tugraz.at',
hiddenActivities: ['dbp-signature-verification-full']
},
@@ -67,8 +56,6 @@ export default {
matomoSiteId: 137,
nextcloudBaseURL: 'https://cloud.tugraz.at',
nextcloudName: 'TU Graz cloud',
- nextcloudAuthInfoDE: nextcloudAuthInfoDE,
- nextcloudAuthInfoEN: nextcloudAuthInfoEN,
pdfAsQualifiedlySigningServer: 'https://sig.tugraz.at',
hiddenActivities: ['dbp-signature-verification-full']
},
diff --git a/assets/dbp-signature.html.ejs b/assets/dbp-signature.html.ejs
index 70d8a53..201e855 100644
--- a/assets/dbp-signature.html.ejs
+++ b/assets/dbp-signature.html.ejs
@@ -142,10 +142,10 @@
<div slot="auth-info">
<dbp-translated subscribe="lang">
<div slot="de">
- <%= nextcloudAuthInfoDE %>
+ Für diese Funktion ist ein TU Graz Bediensteten Account nötig!
</div>
<div slot="en">
- <%= nextcloudAuthInfoEN %>
+ A TU Graz employee account is required for this function!
</div>
</dbp-translated>
</div>
diff --git a/rollup.config.js b/rollup.config.js
index 945cfdb..cb3b85b 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -39,8 +39,6 @@ if (appEnv in appConfig) {
matomoSiteId: -1,
nextcloudBaseURL: 'https://test',
nextcloudName: '',
- nextcloudAuthInfoDE: '',
- nextcloudAuthInfoEN: '',
pdfAsQualifiedlySigningServer: 'https://test',
hiddenActivities: [],
};
@@ -133,8 +131,6 @@ export default (async () => {
nextcloudBaseURL: config.nextcloudBaseURL,
nextcloudFileURL: config.nextcloudFileURL,
nextcloudName: config.nextcloudName,
- nextcloudAuthInfoDE: config.nextcloudAuthInfoDE,
- nextcloudAuthInfoEN: config.nextcloudAuthInfoEN,
keyCloakBaseURL: config.keyCloakBaseURL,
keyCloakClientId: config.keyCloakClientId,
CSP: config.CSP,
diff --git a/vendor/toolkit b/vendor/toolkit
index e3594e1..7f1a221 160000
--- a/vendor/toolkit
+++ b/vendor/toolkit
@@ -1 +1 @@
-Subproject commit e3594e1de8d3ed44c88b2d7afa5316a91933a001
+Subproject commit 7f1a221a03fdd034be139967dc9efa1439be0166
--
GitLab