From f2b182a34a28dfd40079d563ff47d2e56e4aae1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=20=EA=A6=AB=EA=A6=B6=20=EA=A6=8F=EA=A7=80?= =?UTF-8?q?=EA=A6=A6=EA=A6=BF=20=EA=A6=A7=20=EA=A6=AE=20=EA=A6=91=20?= =?UTF-8?q?=EA=A6=A9=20=EA=A6=AD=EA=A7=80?= Date: Thu, 12 Sep 2019 17:32:14 +0800 Subject: The user name member is used for login instead of email address --- main.qml | 2 +- pages/ConfirmPassword.qml | 4 ++-- pages/Email.qml | 2 +- pages/Password.qml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/main.qml b/main.qml index 5449a2f..bf800b6 100644 --- a/main.qml +++ b/main.qml @@ -9,7 +9,7 @@ ApplicationWindow { visible: true Material.accent: Material.DeepPurple - signal logIn(string emailAddress, string password) + signal logIn(string name, string password) Drawer { id: drawer diff --git a/pages/ConfirmPassword.qml b/pages/ConfirmPassword.qml index 1f2dd2f..51390f9 100644 --- a/pages/ConfirmPassword.qml +++ b/pages/ConfirmPassword.qml @@ -7,13 +7,13 @@ PasswordForm { backButton.onClicked: stackView.pop() userEmail.y: 292 instructionLabel.text: qsTr("Re-Enter password") - emailAddressLabel.text: User.emailAddress + emailAddressLabel.text: User.name passTextField.placeholderText: qsTr("Re-enter Password") createPassButton { text: qsTr("Confirm password") onClicked: { - appWindow.logIn(User.emailAddress, User.password) + appWindow.logIn(User.name, User.password) stackView.push("qrc:/pages/CreateProfile.qml") } } diff --git a/pages/Email.qml b/pages/Email.qml index 3f7a237..e489753 100644 --- a/pages/Email.qml +++ b/pages/Email.qml @@ -7,7 +7,7 @@ EmailForm { backButton.onClicked: stackView.pop() loginButton.onClicked: { - User.emailAddress = emailTextField.text + User.name = emailTextField.text stackView.push("qrc:/pages/Password.qml") } } diff --git a/pages/Password.qml b/pages/Password.qml index 241f299..2464af0 100644 --- a/pages/Password.qml +++ b/pages/Password.qml @@ -5,7 +5,7 @@ PasswordForm { width: stackView.width height: stackView.height backButton.onClicked: stackView.pop() - emailAddressLabel.text: User.emailAddress + emailAddressLabel.text: User.name createPassButton.onClicked: { User.password = passTextField.text -- cgit v1.2.3