diff --git a/Gui/AddNewOffer.qml b/Gui/AddNewOffer.qml index 798b457..13acd29 100644 --- a/Gui/AddNewOffer.qml +++ b/Gui/AddNewOffer.qml @@ -184,6 +184,23 @@ GridLayout Layout.fillWidth: true Layout.alignment: Qt.AlignVCenter } + Item + { + Layout.columnSpan: 2 + } + //New Grid + Label + { + text: qsTr("Leistungen:") + Layout.alignment: Qt.AlignRight + font: Typography.h2 + + + } + Item + { + Layout.columnSpan: 3 + } diff --git a/Gui/AdminUserConfig.qml b/Gui/AdminUserConfig.qml index b90212f..97c8f95 100644 --- a/Gui/AdminUserConfig.qml +++ b/Gui/AdminUserConfig.qml @@ -51,6 +51,15 @@ GridLayout placeholderText: qsTr("Hier Passwort eingeben") Layout.fillWidth: true property string name: "PYQCRM_USER_PASS" + color: acceptableInput ? "black" : "red" + ToolTip.visible: hovered && !acceptableInput + ToolTip.text: "Passwort muss mind. 12 Zeichen lang sein und Groß-, Kleinbuchstaben, Zahlen sowie Sonderzeichen (!@#$%^&*()_+-=) enthalten." + + validator: RegularExpressionValidator { + regularExpression: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[!@#$%^&*()_+\-=]).{12,}$/ + } + + } Label { diff --git a/lib/Vermasseln.py b/lib/Vermasseln.py index 67570cb..c081a33 100644 --- a/lib/Vermasseln.py +++ b/lib/Vermasseln.py @@ -2,6 +2,7 @@ from Crypto.Cipher import AES from base64 import b64encode, b64decode import platform +import bcrypt from Crypto.Hash import SHA256, SHA3_512 from Crypto.Protocol.KDF import PBKDF2 from Crypto.Random import get_random_bytes