From d0c1501d4a1c4583b58452fb4a057574aedca0a5 Mon Sep 17 00:00:00 2001 From: Rosanny Date: Mon, 21 Mar 2022 15:50:36 +0100 Subject: [PATCH 1/8] fixing vulnerabilities --- package-lock.json | 233 +++++++++++++--------------------------------- 1 file changed, 63 insertions(+), 170 deletions(-) diff --git a/package-lock.json b/package-lock.json index 817a7b40..23ee6a3a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1148,6 +1148,14 @@ "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.0.tgz", "integrity": "sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==" }, + "node_modules/@xmldom/xmldom": { + "version": "0.7.5", + "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.5.tgz", + "integrity": "sha512-V3BIhmY36fXZ1OtVcI9W+FxQqxVLsPKcNjWigIaa81dLC9IolJl5Mt4Cvhmr0flUnjSpTdrbMTSbXqYqV5dT6A==", + "engines": { + "node": ">=10.0.0" + } + }, "node_modules/abab": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz", @@ -1243,62 +1251,12 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "node_modules/ansi-align": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz", - "integrity": "sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==", - "dev": true, - "dependencies": { - "string-width": "^3.0.0" - } - }, - "node_modules/ansi-align/node_modules/ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/ansi-align/node_modules/emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", - "dev": true - }, - "node_modules/ansi-align/node_modules/is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/ansi-align/node_modules/string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "dependencies": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/ansi-align/node_modules/strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz", + "integrity": "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==", "dev": true, "dependencies": { - "ansi-regex": "^4.1.0" - }, - "engines": { - "node": ">=6" + "string-width": "^4.1.0" } }, "node_modules/ansi-escapes": { @@ -1316,9 +1274,9 @@ } }, "node_modules/ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "engines": { "node": ">=8" } @@ -1448,11 +1406,11 @@ } }, "node_modules/axios": { - "version": "0.21.1", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz", - "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==", + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", + "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", "dependencies": { - "follow-redirects": "^1.10.0" + "follow-redirects": "^1.14.0" } }, "node_modules/babel-jest": { @@ -3069,9 +3027,9 @@ } }, "node_modules/follow-redirects": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz", - "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==", + "version": "1.14.9", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz", + "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==", "funding": [ { "type": "individual", @@ -7333,9 +7291,9 @@ "integrity": "sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==" }, "node_modules/tmpl": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz", - "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=" + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", + "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==" }, "node_modules/to-fast-properties": { "version": "2.0.0", @@ -7969,47 +7927,31 @@ } }, "node_modules/xml-crypto": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/xml-crypto/-/xml-crypto-2.1.2.tgz", - "integrity": "sha512-DBhZXtBjENtLwJmeJhLUBwUm9YWNjCRvAx6ESP4VJyM9PDuKqZu2Fp5Y5HKqcdJT7vV7eI25Z4UBMezji6QloQ==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/xml-crypto/-/xml-crypto-2.1.3.tgz", + "integrity": "sha512-MpXZwnn9JK0mNPZ5mnFIbNnQa+8lMGK4NtnX2FlJMfMWR60sJdFO9X72yO6ji068pxixzk53O7x0/iSKh6IhyQ==", "dependencies": { - "xmldom": "^0.6.0", + "@xmldom/xmldom": "^0.7.0", "xpath": "0.0.32" }, "engines": { "node": ">=0.4.0" } }, - "node_modules/xml-crypto/node_modules/xmldom": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.6.0.tgz", - "integrity": "sha512-iAcin401y58LckRZ0TkI4k0VSM1Qg0KGSc3i8rU+xrxe19A/BN1zHyVSJY7uoutVlaTSzYyk/v5AmkewAP7jtg==", - "engines": { - "node": ">=10.0.0" - } - }, "node_modules/xml-encryption": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/xml-encryption/-/xml-encryption-1.2.4.tgz", - "integrity": "sha512-+4aSBIv/lwmv5PntfYsZyelOnCcyDmCt/MNxXUukRGlcWW8DObJ26obbVX3iXYRdqkLqbv3AKk8ntNCGKIq/UQ==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/xml-encryption/-/xml-encryption-1.3.0.tgz", + "integrity": "sha512-3P8C4egMMxSR1BmsRM+fG16a3WzOuUEQKS2U4c3AZ5v7OseIfdUeVkD8dwxIhuLryFZSRWUL5OP6oqkgU7hguA==", "dependencies": { + "@xmldom/xmldom": "^0.7.0", "escape-html": "^1.0.3", "node-forge": "^0.10.0", - "xmldom": "~0.6.0", "xpath": "0.0.32" }, "engines": { "node": ">=8" } }, - "node_modules/xml-encryption/node_modules/xmldom": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.6.0.tgz", - "integrity": "sha512-iAcin401y58LckRZ0TkI4k0VSM1Qg0KGSc3i8rU+xrxe19A/BN1zHyVSJY7uoutVlaTSzYyk/v5AmkewAP7jtg==", - "engines": { - "node": ">=10.0.0" - } - }, "node_modules/xml-name-validator": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz", @@ -9072,6 +9014,11 @@ "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.0.tgz", "integrity": "sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==" }, + "@xmldom/xmldom": { + "version": "0.7.5", + "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.5.tgz", + "integrity": "sha512-V3BIhmY36fXZ1OtVcI9W+FxQqxVLsPKcNjWigIaa81dLC9IolJl5Mt4Cvhmr0flUnjSpTdrbMTSbXqYqV5dT6A==" + }, "abab": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz", @@ -9142,52 +9089,12 @@ } }, "ansi-align": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz", - "integrity": "sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz", + "integrity": "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==", "dev": true, "requires": { - "string-width": "^3.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true - }, - "emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } - } + "string-width": "^4.1.0" } }, "ansi-escapes": { @@ -9199,9 +9106,9 @@ } }, "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" }, "ansi-styles": { "version": "4.3.0", @@ -9295,11 +9202,11 @@ "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==" }, "axios": { - "version": "0.21.1", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz", - "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==", + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", + "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", "requires": { - "follow-redirects": "^1.10.0" + "follow-redirects": "^1.14.0" } }, "babel-jest": { @@ -10550,9 +10457,9 @@ } }, "follow-redirects": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz", - "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==" + "version": "1.14.9", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz", + "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==" }, "for-in": { "version": "1.0.2", @@ -13843,9 +13750,9 @@ "integrity": "sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==" }, "tmpl": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz", - "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=" + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", + "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==" }, "to-fast-properties": { "version": "2.0.0", @@ -14317,37 +14224,23 @@ "dev": true }, "xml-crypto": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/xml-crypto/-/xml-crypto-2.1.2.tgz", - "integrity": "sha512-DBhZXtBjENtLwJmeJhLUBwUm9YWNjCRvAx6ESP4VJyM9PDuKqZu2Fp5Y5HKqcdJT7vV7eI25Z4UBMezji6QloQ==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/xml-crypto/-/xml-crypto-2.1.3.tgz", + "integrity": "sha512-MpXZwnn9JK0mNPZ5mnFIbNnQa+8lMGK4NtnX2FlJMfMWR60sJdFO9X72yO6ji068pxixzk53O7x0/iSKh6IhyQ==", "requires": { - "xmldom": "^0.6.0", + "@xmldom/xmldom": "^0.7.0", "xpath": "0.0.32" - }, - "dependencies": { - "xmldom": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.6.0.tgz", - "integrity": "sha512-iAcin401y58LckRZ0TkI4k0VSM1Qg0KGSc3i8rU+xrxe19A/BN1zHyVSJY7uoutVlaTSzYyk/v5AmkewAP7jtg==" - } } }, "xml-encryption": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/xml-encryption/-/xml-encryption-1.2.4.tgz", - "integrity": "sha512-+4aSBIv/lwmv5PntfYsZyelOnCcyDmCt/MNxXUukRGlcWW8DObJ26obbVX3iXYRdqkLqbv3AKk8ntNCGKIq/UQ==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/xml-encryption/-/xml-encryption-1.3.0.tgz", + "integrity": "sha512-3P8C4egMMxSR1BmsRM+fG16a3WzOuUEQKS2U4c3AZ5v7OseIfdUeVkD8dwxIhuLryFZSRWUL5OP6oqkgU7hguA==", "requires": { + "@xmldom/xmldom": "^0.7.0", "escape-html": "^1.0.3", "node-forge": "^0.10.0", - "xmldom": "~0.6.0", "xpath": "0.0.32" - }, - "dependencies": { - "xmldom": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.6.0.tgz", - "integrity": "sha512-iAcin401y58LckRZ0TkI4k0VSM1Qg0KGSc3i8rU+xrxe19A/BN1zHyVSJY7uoutVlaTSzYyk/v5AmkewAP7jtg==" - } } }, "xml-name-validator": { -- GitLab From 55ce4bfd7f8e07b65613d18ffef8ad3bdbbc1239 Mon Sep 17 00:00:00 2001 From: Rosanny Date: Mon, 21 Mar 2022 16:36:06 +0100 Subject: [PATCH 2/8] add privacy policy checkbox --- views/DE/account/registration.pug | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/views/DE/account/registration.pug b/views/DE/account/registration.pug index a49cc21a..ee26b8b8 100644 --- a/views/DE/account/registration.pug +++ b/views/DE/account/registration.pug @@ -61,6 +61,11 @@ html(lang="de") input#inputIndustry(name="inputIndustry", type="text", class="form-control", placeholder="Branche", maxlength="45") div(class="form-group") input#inputSpeciality(name="inputSpeciality", type="text", class="form-control", placeholder="Fachgebiete", maxlength="100") + div(class="pt-2 mb-3 form-check") + input(class="form-check-input" type="checkbox" id="privacyPolicy" name="privacyPolicy" required) + label(class="form-check-label" for="privacyPolicy") + | Ich akzeptiere die Datenschutzerklärung. * + p * Pflichtfeld input#submitBtn(type="submit", class="btn btn-outline-dark btn-block", value="Senden" disabled) br -- GitLab From 4776f2ac2c144fd2b5a5af2809671cee0d493798 Mon Sep 17 00:00:00 2001 From: Rosanny Date: Tue, 22 Mar 2022 15:25:04 +0100 Subject: [PATCH 3/8] MLAB-643: fixing UI issues (cherry picked from commit 7d6fb0d08807dddb36cb5c46062d17af5091afdc) --- views/DE/account/forgotPwd.pug | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/views/DE/account/forgotPwd.pug b/views/DE/account/forgotPwd.pug index 07e90a89..4827e727 100644 --- a/views/DE/account/forgotPwd.pug +++ b/views/DE/account/forgotPwd.pug @@ -6,6 +6,7 @@ html(lang="de") meta(name="viewport", content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no") link(rel="stylesheet", type="text/css", href="/css/bootstrap.min.css") link(rel="stylesheet", type="text/css", href="/css/m4lab.css") + link(rel="stylesheet", type="text/css", href="/css/m4lab-mobile.css") link(rel="stylesheet", type="text/css", href="/css/custom/login.css") link(rel="stylesheet", href="https://use.fontawesome.com/releases/v5.8.2/css/all.css", integrity="sha384-oS3vJWv+0UjzBfQzYUhtDYW+Pj2yciDJxpsK1OYPAYjqT085Qq/1cq5FLXAZQ7Ay", crossorigin="anonymous") body @@ -19,7 +20,7 @@ html(lang="de") div.alert.alert-danger.alert-dismissible.fade.show #{flash.error} a(class="close", href="#", data-dismiss="alert", aria-label="close") × form#forgotForm(class="form-signin", method="POST") - img(src="https://transfer.hft-stuttgart.de/images/demo/m4lab_logo.jpg", class="img-responsive center-block", width="185", height="192") + img(src="https://transfer.hft-stuttgart.de/img/M4_LAB_LOGO.png", class="img-responsive center-block", width="185", height="192") div(class="form-row") input#inputEmail(name="inputEmail", type="email", class="form-control", placeholder="E-Mail-Adresse" required) br @@ -32,3 +33,4 @@ html(lang="de") script(src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous") // M4_LAB script(src="/js/headfoot.js") + script(src="/js/mobile.js") -- GitLab From fa976f4bb86a6397160edd25b40fc1b5a224aa50 Mon Sep 17 00:00:00 2001 From: Rosanny Date: Tue, 22 Mar 2022 15:40:39 +0100 Subject: [PATCH 4/8] fix UI issue in Reset Password page --- views/DE/account/reset.pug | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/views/DE/account/reset.pug b/views/DE/account/reset.pug index a6ef872a..e81e1166 100644 --- a/views/DE/account/reset.pug +++ b/views/DE/account/reset.pug @@ -6,6 +6,7 @@ html(lang="de") meta(name="viewport", content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no") link(rel="stylesheet", type="text/css", href="/css/bootstrap.min.css") link(rel="stylesheet", type="text/css", href="/css/m4lab.css") + link(rel="stylesheet", type="text/css", href="/css/m4lab-mobile.css") link(rel="stylesheet", type="text/css", href="/css/custom/login.css") link(rel="stylesheet", href="https://use.fontawesome.com/releases/v5.8.2/css/all.css", integrity="sha384-oS3vJWv+0UjzBfQzYUhtDYW+Pj2yciDJxpsK1OYPAYjqT085Qq/1cq5FLXAZQ7Ay", crossorigin="anonymous") body @@ -21,7 +22,7 @@ html(lang="de") div.alert.alert-danger.alert-dismissible.fade.show #{ error } a(class="close", href="#", data-dismiss="alert", aria-label="close") × form#forgotForm(method="POST", class="form-signin") - img(src="https://transfer.hft-stuttgart.de/images/demo/m4lab_logo.jpg", class="img-responsive center-block", width="185", height="192") + img(src="https://transfer.hft-stuttgart.de/img/M4_LAB_LOGO.png", class="img-responsive center-block", width="185", height="192") div(class="form-row") input#inputNewPwd(name="inputNewPwd", type="password", class="form-control", placeholder="Neues Passwort" required) span#recommendation(class='warning') @@ -38,3 +39,4 @@ html(lang="de") script(src="/js/security.js") script(src="/js/generalFunction.js") script(src="/js/headfoot.js") + script(src="/js/mobile.js") \ No newline at end of file -- GitLab From 2273844d953a00f49be3ac6bf338c551c6759fcd Mon Sep 17 00:00:00 2001 From: Rosanny Date: Tue, 22 Mar 2022 17:18:39 +0100 Subject: [PATCH 5/8] MLAB-642: change var to let --- routes/public.ts | 68 ++++++++++++++++++++++++------------------------ 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/routes/public.ts b/routes/public.ts index f535b5e2..a0714532 100644 --- a/routes/public.ts +++ b/routes/public.ts @@ -15,8 +15,8 @@ export = function (app:any, config:any, lang:string) { }) app.post('/registration', function(req:any, res:any) { // user data - var curDate:Date = new Date() - var userData:any = { + let curDate:Date = new Date() + let userData:any = { salutation: req.body.inputSalutation, title: req.body.inputTitle, firstname: req.body.inputFirstname, @@ -28,10 +28,10 @@ export = function (app:any, config:any, lang:string) { createdDate: curDate.toISOString().slice(0,10) } - var userEmail:any = userData.email - var pos:number = userEmail.indexOf('@') - var emailLength:number = userEmail.length - var emailDomain:any = userEmail.slice(pos, emailLength); + let userEmail:any = userData.email + let pos:number = userEmail.indexOf('@') + let emailLength:number = userEmail.length + let emailDomain:any = userEmail.slice(pos, emailLength); if ( emailDomain.toLowerCase() == "@hft-stuttgart.de") { res.flash('error', "Fehlgeschlagen: HFT-Account") @@ -48,7 +48,7 @@ export = function (app:any, config:any, lang:string) { // encrypt password bcrypt.genSalt(saltRounds, function(err, salt) { bcrypt.hash(req.body.inputPassword, salt, function(err:any, hash:any) { - var newAccount:any = { + let newAccount:any = { profile: userData, password: hash, verificationToken: token @@ -65,8 +65,8 @@ export = function (app:any, config:any, lang:string) { } else { // send email - var emailSubject = "Bitte bestätigen Sie Ihr M4_LAB Benutzerkonto" - var emailContent = '
Lieber Nutzer,

' + + let emailSubject = "Bitte bestätigen Sie Ihr M4_LAB Benutzerkonto" + let emailContent = '
Lieber Nutzer,

' + '

vielen Dank für Ihre Anmeldung am Transferportal der HFT Stuttgart.
' + 'Um Ihre Anmeldung zu bestätigen, klicken Sie bitte diesen Link ' + '

' + @@ -134,23 +134,23 @@ export = function (app:any, config:any, lang:string) { }) } else { // send email - var emailSubject = "Herzlich willkommen" - var emailContent = '

Lieber Nutzer,

' + - '

herzlich willkommen beim Transferportal der HFT Stuttgart!
' + - 'Sie können nun alle Dienste des Portals nutzen.


' + constants.mailSignature; - mailer.options.to = userEmail - mailer.options.subject = emailSubject - mailer.options.html = emailContent - mailer.transporter.sendMail(mailer.options, function(err:any) { - if (err) { - console.log('cannot send email') - throw err - } - }) + let emailSubject = "Herzlich willkommen"; + let emailContent = '

Lieber Nutzer,

' + + '

herzlich willkommen beim Transferportal der HFT Stuttgart!
' + + 'Sie können nun alle Dienste des Portals nutzen.


' + constants.mailSignature; + mailer.options.to = userEmail; + mailer.options.subject = emailSubject; + mailer.options.html = emailContent; + mailer.transporter.sendMail(mailer.options, function(err:any) { + if (err) { + console.log('cannot send email'); + throw err; + } + }) - res.render(lang+'/account/verification', { - status: true - }) + res.render(lang+'/account/verification', { + status: true + }) } } }) @@ -179,13 +179,13 @@ export = function (app:any, config:any, lang:string) { token += randomChars.charAt(Math.floor(Math.random() * randomChars.length)); } - var emailSubject = "Ihre Passwort-Anfrage an das Transferportal der HFT Stuttgart"; - var emailContent = '

Lieber Nutzer,

' + + let emailSubject = "Ihre Passwort-Anfrage an das Transferportal der HFT Stuttgart"; + let emailContent = '
Lieber Nutzer,

' + '

wir haben Ihre Anfrage zur Erneuerung Ihres Passwortes erhalten. Falls Sie diese Anfrage nicht gesendet haben, ignorieren Sie bitte diese E-Mail.

' + 'Sie können Ihr Passwort mit dem Klick auf diesen Link ändern: '+config.app.host+'/reset/' + token + '
' + 'Dieser Link ist aus Sicherheitsgründen nur für 1 Stunde gültig.

' + constants.mailSignature + '
' - var credentialData = { + let credentialData = { user_id: user.id, resetPasswordToken: token, resetPasswordExpires: Date.now() + 3600000 // 1 hour @@ -227,9 +227,9 @@ export = function (app:any, config:any, lang:string) { } }) app.post('/reset/:token', async function(req:any, res:any) { - var newPwd = req.body.inputNewPwd + let newPwd = req.body.inputNewPwd - var user = await methods.getUserByToken(req.params.token) + let user = await methods.getUserByToken(req.params.token) if (!user) { res.flash('error', "User not found.") res.redirect('/login') @@ -267,9 +267,9 @@ export = function (app:any, config:any, lang:string) { // ======================= CONTACT FORM =========================== app.get('/contact', function (req:any, res:any) { - res.render(lang+'/account/contact', { - user: req.user - }) + res.render(lang+'/account/contact', { + user: req.user + }) }) app.post('/contact', function(req:any, res:any, next:any) { //methods.currentDate(); @@ -277,8 +277,8 @@ export = function (app:any, config:any, lang:string) { let supportAddress = "support-transfer@hft-stuttgart.de"; let inputName = req.body.name; let inputContent = req.body.message; - let emailContent = "Es wurde eine Anfrage an das Transferportal gestellt: \n\n NAME: " + inputName + "\n NACHRICHT:\n "+ inputContent; let emailSubject = "Ihre Anfrage an das Transferportal"; + let emailContent = "Es wurde eine Anfrage an das Transferportal gestellt: \n\n NAME: " + inputName + "\n NACHRICHT:\n "+ inputContent; async.waterfall([ function(done:any) { // send email -- GitLab From c4758596ba19f4af80c71ad8021213aeedcd1141 Mon Sep 17 00:00:00 2001 From: Rosanny Date: Tue, 22 Mar 2022 19:56:12 +0100 Subject: [PATCH 6/8] MLAB-642: fixing email content --- routes/public.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routes/public.ts b/routes/public.ts index a0714532..8fe48b93 100644 --- a/routes/public.ts +++ b/routes/public.ts @@ -285,7 +285,7 @@ export = function (app:any, config:any, lang:string) { mailer.options.to = supportAddress; mailer.options.cc = emailAddress; mailer.options.subject = emailSubject; - mailer.options.text = emailContent; + mailer.options.html = emailContent; mailer.transporter.sendMail(mailer.options, function(err:any) { done(err, 'done'); }); -- GitLab From fbf59c98892ff353a0078521a6a32772f9503aab Mon Sep 17 00:00:00 2001 From: Rosanny Date: Tue, 22 Mar 2022 20:03:56 +0100 Subject: [PATCH 7/8] MLAB-642: fixing the content format --- routes/public.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routes/public.ts b/routes/public.ts index 8fe48b93..9f57ad15 100644 --- a/routes/public.ts +++ b/routes/public.ts @@ -278,7 +278,7 @@ export = function (app:any, config:any, lang:string) { let inputName = req.body.name; let inputContent = req.body.message; let emailSubject = "Ihre Anfrage an das Transferportal"; - let emailContent = "Es wurde eine Anfrage an das Transferportal gestellt: \n\n NAME: " + inputName + "\n NACHRICHT:\n "+ inputContent; + let emailContent = "
Es wurde eine Anfrage an das Transferportal gestellt:

NAME: " + inputName + "
NACHRICHT: "+ inputContent+"
"; async.waterfall([ function(done:any) { // send email -- GitLab From 2f5f67767e733c98f1b91d6f39f69dae57bb50ea Mon Sep 17 00:00:00 2001 From: Rosanny Date: Wed, 23 Mar 2022 15:16:04 +0100 Subject: [PATCH 8/8] add URL to Privacy Policy --- views/DE/account/registration.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/DE/account/registration.pug b/views/DE/account/registration.pug index ee26b8b8..f484c19c 100644 --- a/views/DE/account/registration.pug +++ b/views/DE/account/registration.pug @@ -64,7 +64,7 @@ html(lang="de") div(class="pt-2 mb-3 form-check") input(class="form-check-input" type="checkbox" id="privacyPolicy" name="privacyPolicy" required) label(class="form-check-label" for="privacyPolicy") - | Ich akzeptiere die Datenschutzerklärung. * + | Ich akzeptiere die Datenschutzerklärung. * p * Pflichtfeld input#submitBtn(type="submit", class="btn btn-outline-dark btn-block", value="Senden" disabled) -- GitLab