From c47e6982f187ac363d62d396819f5b438c63aad4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=EA=A6=AB=EA=A6=B6=EA=A6=8F=EA=A7=80=EA=A6=A6?= =?UTF-8?q?=EA=A6=BF=EA=A6=A7=EA=A6=AE=EA=A6=91=EA=A6=A9=EA=A6=AD=EA=A7=80?= Date: Wed, 8 Feb 2023 18:17:26 +0800 Subject: Fix remaining sign in text & fonts --- SignInFlickable.ui.qml | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/SignInFlickable.ui.qml b/SignInFlickable.ui.qml index f832b22..4d83eaa 100644 --- a/SignInFlickable.ui.qml +++ b/SignInFlickable.ui.qml @@ -8,6 +8,12 @@ GridLayout { property alias signInButton: button property alias signInSignUp: signUp + FontLoader { + id: heebo + name: "Heebo" + source: "Heebo/Heebo-Bold.ttf" + } + ColumnLayout { Layout.rightMargin: 16 Layout.leftMargin: 16 @@ -16,12 +22,11 @@ GridLayout { spacing: 16 ColumnLayout { id: columnLayout - Layout.fillWidth: true Label { id: signInTitle - text: qsTr("Sign In Title") - font.family: "Roboto" + text: qsTr("Login Into Eduport") + font.family: heebo.name font.weight: Font.Medium font.pointSize: 40 } @@ -29,16 +34,20 @@ GridLayout { Label { id: signInSubtitle color: "#6c757d" - text: qsTr("Sign In Subtitle") + text: qsTr("Nice to see you! Please log" + + " in with your account.") + wrapMode: Text.Wrap + Layout.fillWidth: true font.weight: Font.Normal font.pointSize: 22 + font.family: "Roboto" } } ColumnLayout { Label { text: qsTr("Email address *") font.pixelSize: 16 - font.family: "roboto" + font.family: "Roboto" } Rectangle { @@ -63,7 +72,7 @@ GridLayout { id: email placeholderText: qsTr("E-mail") font.pixelSize: 16 - font.family: "roboto" + font.family: "Roboto" Layout.fillWidth: true Layout.fillHeight: true background: Rectangle { @@ -78,7 +87,7 @@ GridLayout { Label { text: qsTr("Password *") font.pixelSize: 16 - font.family: "roboto" + font.family: "Roboto" } Rectangle { @@ -98,8 +107,9 @@ GridLayout { } TextField { id: password - placeholderText: qsTr("Password") + placeholderText: qsTr("password") font.pixelSize: 16 + font.family: "Roboto" Layout.fillWidth: true Layout.fillHeight: true background: Rectangle { @@ -111,7 +121,7 @@ GridLayout { } Label { id: passwordHelper - text: "Your password must atleast 8 characters long" + text: "Your password must be 8 characters at least" font.pixelSize: 12 color: "#6c757d" } @@ -126,6 +136,7 @@ GridLayout { contentItem: Text { color: "#6c757d" text: rememberCheckBox.text + font: rememberCheckBox.font verticalAlignment: Text.AlignVCenter leftPadding: rememberCheckBox.indicator.width + rememberCheckBox.spacing } @@ -169,11 +180,13 @@ GridLayout { Label { text: qsTr("Don't have an account?") font.pixelSize: 16 + font.family: "Roboto" } Text { id: signUp text: "Signup here" font.pixelSize: 16 + font.family: "Roboto" font.underline: false linkColor: Qt.rgba(.0235, .416, .788, 1.0) } -- cgit v1.2.3 From 341f456177a17ce5eebf068ce918ddff02012507 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=EA=A6=AB=EA=A6=B6=EA=A6=8F=EA=A7=80=EA=A6=A6?= =?UTF-8?q?=EA=A6=BF=EA=A6=A7=EA=A6=AE=EA=A6=91=EA=A6=A9=EA=A6=AD=EA=A7=80?= Date: Wed, 8 Feb 2023 18:21:27 +0800 Subject: Set sign in pass echo mode --- SignInFlickable.ui.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/SignInFlickable.ui.qml b/SignInFlickable.ui.qml index 4d83eaa..17f11be 100644 --- a/SignInFlickable.ui.qml +++ b/SignInFlickable.ui.qml @@ -108,6 +108,7 @@ GridLayout { TextField { id: password placeholderText: qsTr("password") + echoMode: TextInput.Password font.pixelSize: 16 font.family: "Roboto" Layout.fillWidth: true -- cgit v1.2.3 From c9d057238a30a9f7b2ceaf76c3cae708c61a674e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=EA=A6=AB=EA=A6=B6=EA=A6=8F=EA=A7=80=EA=A6=A6?= =?UTF-8?q?=EA=A6=BF=EA=A6=A7=EA=A6=AE=EA=A6=91=EA=A6=A9=EA=A6=AD=EA=A7=80?= Date: Wed, 8 Feb 2023 18:24:51 +0800 Subject: Title wraps too --- SignInFlickable.ui.qml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SignInFlickable.ui.qml b/SignInFlickable.ui.qml index 17f11be..9a66e90 100644 --- a/SignInFlickable.ui.qml +++ b/SignInFlickable.ui.qml @@ -26,6 +26,8 @@ GridLayout { Label { id: signInTitle text: qsTr("Login Into Eduport") + wrapMode: Text.Wrap + Layout.fillWidth: true font.family: heebo.name font.weight: Font.Medium font.pointSize: 40 -- cgit v1.2.3 From 4480d8ba101ce55bf304ed6e348f217fd7b4807f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=EA=A6=AB=EA=A6=B6=EA=A6=8F=EA=A7=80=EA=A6=A6?= =?UTF-8?q?=EA=A6=BF=EA=A6=A7=EA=A6=AE=EA=A6=91=EA=A6=A9=EA=A6=AD=EA=A7=80?= Date: Wed, 8 Feb 2023 18:33:29 +0800 Subject: Wrap SignIn with Flickable --- SignInFlickable.ui.qml | 321 ++++++++++++++++++++++++++----------------------- 1 file changed, 170 insertions(+), 151 deletions(-) diff --git a/SignInFlickable.ui.qml b/SignInFlickable.ui.qml index 9a66e90..15fd3e3 100644 --- a/SignInFlickable.ui.qml +++ b/SignInFlickable.ui.qml @@ -2,11 +2,12 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.15 -GridLayout { +Flickable { property alias signInEmail: email property alias signInPassword: password property alias signInButton: button property alias signInSignUp: signUp + contentHeight: container.height FontLoader { id: heebo @@ -14,185 +15,203 @@ GridLayout { source: "Heebo/Heebo-Bold.ttf" } - ColumnLayout { - Layout.rightMargin: 16 - Layout.leftMargin: 16 + GridLayout { + id: container + anchors { + top: parent.top + left: parent.left + right: parent.right + } ColumnLayout { - spacing: 16 - ColumnLayout { - id: columnLayout - - Label { - id: signInTitle - text: qsTr("Login Into Eduport") - wrapMode: Text.Wrap - Layout.fillWidth: true - font.family: heebo.name - font.weight: Font.Medium - font.pointSize: 40 - } - - Label { - id: signInSubtitle - color: "#6c757d" - text: qsTr("Nice to see you! Please log" - + " in with your account.") - wrapMode: Text.Wrap - Layout.fillWidth: true - font.weight: Font.Normal - font.pointSize: 22 - font.family: "Roboto" - } - } + Layout.rightMargin: 16 + Layout.leftMargin: 16 + ColumnLayout { - Label { - text: qsTr("Email address *") - font.pixelSize: 16 - font.family: "Roboto" + spacing: 16 + ColumnLayout { + id: columnLayout + + Label { + id: signInTitle + text: qsTr("Login Into Eduport") + wrapMode: Text.Wrap + Layout.fillWidth: true + font.family: heebo.name + font.weight: Font.Medium + font.pointSize: 40 + } + + Label { + id: signInSubtitle + color: "#6c757d" + text: qsTr("Nice to see you! " + + "Please log in with " + + "your account.") + wrapMode: Text.Wrap + Layout.fillWidth: true + font.weight: Font.Normal + font.pointSize: 22 + font.family: "Roboto" + } } + ColumnLayout { + Label { + text: qsTr("Email address *") + font.pixelSize: 16 + font.family: "Roboto" + } - Rectangle { - implicitHeight: 56 - color: "#f5f7f9" - radius: 8 - border.width: 0 - Layout.fillWidth: true + Rectangle { + implicitHeight: 56 + color: "#f5f7f9" + radius: 8 + border.width: 0 + Layout.fillWidth: true - RowLayout { - anchors.fill: parent - Image { - id: envelope - source: "Bootstrap/icons/envelope-fill.svg" - sourceSize { - width: 24 - height: 24 + RowLayout { + anchors.fill: parent + Image { + id: envelope + source: "Bootstrap/icons/envelope-fill.svg" + sourceSize { + width: 24 + height: 24 + } + Layout.margins: 16 } - Layout.margins: 16 - } - TextField { - id: email - placeholderText: qsTr("E-mail") - font.pixelSize: 16 - font.family: "Roboto" - Layout.fillWidth: true - Layout.fillHeight: true - background: Rectangle { - color: "transparent" + TextField { + id: email + placeholderText: qsTr("E-mail") + font.pixelSize: 16 + font.family: "Roboto" + Layout.fillWidth: true + Layout.fillHeight: true + background: Rectangle { + color: "transparent" + } } } } } - } - ColumnLayout { - Label { - text: qsTr("Password *") - font.pixelSize: 16 - font.family: "Roboto" - } + ColumnLayout { + Label { + text: qsTr("Password *") + font.pixelSize: 16 + font.family: "Roboto" + } - Rectangle { - implicitHeight: 56 - color: "#f5f7f9" - radius: 8 - border.width: 0 - Layout.fillWidth: true + Rectangle { + implicitHeight: 56 + color: "#f5f7f9" + radius: 8 + border.width: 0 + Layout.fillWidth: true - RowLayout { - anchors.fill: parent - Image { - source: "Font-Awesome/svgs/solid/lock.svg" - Layout.maximumHeight: 24 - Layout.maximumWidth: 24 - Layout.margins: 16 - } - TextField { - id: password - placeholderText: qsTr("password") - echoMode: TextInput.Password - font.pixelSize: 16 - font.family: "Roboto" - Layout.fillWidth: true - Layout.fillHeight: true - background: Rectangle { - color: "transparent" + RowLayout { + anchors.fill: parent + Image { + source: "Font-Awesome/svgs/solid/lock.svg" + Layout.maximumHeight: 24 + Layout.maximumWidth: 24 + Layout.margins: 16 + } + TextField { + id: password + placeholderText: qsTr("password") + echoMode: TextInput.Password + font.pixelSize: 16 + font.family: "Roboto" + Layout.fillWidth: true + Layout.fillHeight: true + background: Rectangle { + color: "transparent" + } } } } } - } - Label { - id: passwordHelper - text: "Your password must be 8 characters at least" - font.pixelSize: 12 - color: "#6c757d" - } - RowLayout { - Layout.fillWidth: true - CheckBox { - id: rememberCheckBox - text: qsTr("Remember me") - font.pointSize: 14 - font.family: "Roboto" + Label { + id: passwordHelper + text: "Your password must be 8 " + + "characters at least" + font.pixelSize: 12 + color: "#6c757d" + } + RowLayout { Layout.fillWidth: true - contentItem: Text { - color: "#6c757d" - text: rememberCheckBox.text - font: rememberCheckBox.font - verticalAlignment: Text.AlignVCenter - leftPadding: rememberCheckBox.indicator.width + rememberCheckBox.spacing + CheckBox { + id: rememberCheckBox + text: qsTr("Remember me") + font.pointSize: 14 + font.family: "Roboto" + Layout.fillWidth: true + contentItem: Text { + color: "#6c757d" + text: rememberCheckBox.text + font: rememberCheckBox.font + verticalAlignment: Text.AlignVCenter + leftPadding: rememberCheckBox.indicator.width + rememberCheckBox.spacing + } + } + Text { + id: forgotPassword + text: "Forgot " + + "password?" + font.family: "Roboto" + font.pointSize: 14 + horizontalAlignment: Text.AlignRight + Layout.fillWidth: true + linkColor: Qt.rgba(.0235, .416, + .788, 1.0) } } - Text { - id: forgotPassword - text: "Forgot password?" - font.family: "Roboto" - font.pointSize: 14 - horizontalAlignment: Text.AlignRight + Button { + id: button + text: qsTr("Login") + font.pixelSize: 16 + implicitHeight: 40 Layout.fillWidth: true - linkColor: Qt.rgba(.0235, .416, .788, 1.0) + + contentItem: Text { + color: "#ffffff" + text: "Login" + horizontalAlignment: Text + .AlignHCenter + verticalAlignment: Text + .AlignVCenter + font.weight: Font.Medium + font.family: "Roboto" + font.pointSize: 14 + } + + background: Rectangle { + color: button.down + ? "#055aab" : "#066ac9" + radius: 8 + } } } - Button { - id: button - text: qsTr("Login") - font.pixelSize: 16 - implicitHeight: 40 - Layout.fillWidth: true - contentItem: Text { - color: "#ffffff" - text: "Login" - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - font.weight: Font.Medium + RowLayout { + Layout.alignment: Qt.AlignHCenter + Label { + text: qsTr("Don't have an account?") + font.pixelSize: 16 font.family: "Roboto" - font.pointSize: 14 } - - background: Rectangle { - color: button.down ? "#055aab" : "#066ac9" - radius: 8 + Text { + id: signUp + text: "Signup " + + "here" + font.pixelSize: 16 + font.family: "Roboto" + font.underline: false + linkColor: Qt.rgba(.0235, .416, .788, + 1.0) } } } - - RowLayout { - Layout.alignment: Qt.AlignHCenter - Label { - text: qsTr("Don't have an account?") - font.pixelSize: 16 - font.family: "Roboto" - } - Text { - id: signUp - text: "Signup here" - font.pixelSize: 16 - font.family: "Roboto" - font.underline: false - linkColor: Qt.rgba(.0235, .416, .788, 1.0) - } - } } } -- cgit v1.2.3 From 0b3235a95290104be6f73247b429651d97ac1a56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=EA=A6=AB=EA=A6=B6=EA=A6=8F=EA=A7=80=EA=A6=A6?= =?UTF-8?q?=EA=A6=BF=EA=A6=A7=EA=A6=AE=EA=A6=91=EA=A6=A9=EA=A6=AD=EA=A7=80?= Date: Wed, 8 Feb 2023 18:41:26 +0800 Subject: Revert "removed height and width" This reverts commit c40b207e0051a2f8c6da25bdb835a97e96f3d1dc. --- CheckoutFlickable.ui.qml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CheckoutFlickable.ui.qml b/CheckoutFlickable.ui.qml index 38ddf5c..617d413 100644 --- a/CheckoutFlickable.ui.qml +++ b/CheckoutFlickable.ui.qml @@ -423,6 +423,8 @@ Flickable { color: "#f5f7f9" } popup: Popup { + width: banks.width + implicitHeight: contentItem.height background: Rectangle { id: banksDropDown radius: 8 -- cgit v1.2.3 From be7ea74d83c97bcbfa8d5de187eaf2a95cd911a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=EA=A6=AB=EA=A6=B6=EA=A6=8F=EA=A7=80=EA=A6=A6?= =?UTF-8?q?=EA=A6=BF=EA=A6=A7=EA=A6=AE=EA=A6=91=EA=A6=A9=EA=A6=AD=EA=A7=80?= Date: Wed, 8 Feb 2023 18:42:13 +0800 Subject: Revert "add dropdown style" This reverts commit 0ee37f1b01a31cde3abc8a218ce83049125b170f. --- CheckoutFlickable.ui.qml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/CheckoutFlickable.ui.qml b/CheckoutFlickable.ui.qml index 617d413..04d3fd2 100644 --- a/CheckoutFlickable.ui.qml +++ b/CheckoutFlickable.ui.qml @@ -422,14 +422,6 @@ Flickable { implicitWidth: 200 color: "#f5f7f9" } - popup: Popup { - width: banks.width - implicitHeight: contentItem.height - background: Rectangle { - id: banksDropDown - radius: 8 - } - } } } } -- cgit v1.2.3