changed `Onboarding` flow

4 files changed, 63 insertions, 10 deletions

diff --git a/features/Login.qml b/features/Login.qml
index 67239cb..44bf53c 100644
--- a/features/Login.qml
+++ b/features/Login.qml
@@ -3,14 +3,7 @@ import QtQuick.Controls 2.12
 import QtQuick.Controls.Material 2.12
 import QtQuick.Layouts 1.12
 
-LoginForm {
-
-        continueButton.onClicked: {
-                            contentView.push("EnterPasswordForm.ui.qml")
-                        }
-}
-
-
+LoginForm {}
 
 /*##^##
 Designer {
diff --git a/features/LoginEmail.qml b/features/LoginEmail.qml
new file mode 100644
index 0000000..bfb1e52
--- /dev/null
+++ b/features/LoginEmail.qml
@@ -0,0 +1,54 @@
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Controls.Material 2.12
+import QtQuick.Layouts 1.12
+
+Page {
+    header:
+    ToolBar {
+
+        background: Rectangle {
+        color: "#FAFFFFFF"
+        }
+        RowLayout {
+            ToolButton {
+                id: toolButton
+                icon.name: "back-button"
+                icon.source: "../components/icons/arrow-back-24px.svg"
+                highlighted: true
+                onClicked: {
+                    if (pageView.depth > 1) {
+                        pageView.pop()
+                    } else {
+                        drawer.open()
+                    }
+                }
+            }
+
+            Label {
+                text: contentView.currentItem.title
+                font.family: "Work Sans"
+                font.weight: Font.Medium
+                font.pointSize: 20
+                wrapMode: Text.WordWrap
+                elide: Label.ElideRight
+                horizontalAlignment: Qt.AlignHCenter
+                verticalAlignment: Qt.AlignVCenter
+            }
+        }
+    }
+
+
+StackView {
+    id: contentView
+    anchors.topMargin: 432
+    anchors.fill: parent
+    initialItem: Login{
+    }
+}
+}
+/*##^##
+Designer {
+    D{i:0;autoSize:true;height:480;width:640}
+}
+##^##*/
diff --git a/features/LoginForm.ui.qml b/features/LoginForm.ui.qml
index 2ea75fb..c69791b 100644
--- a/features/LoginForm.ui.qml
+++ b/features/LoginForm.ui.qml
@@ -11,7 +11,7 @@ Page {
 
     Text {
         id: pageTitle
-        text: stackView.currentItem.title
+        text: pageView.currentItem.title
         verticalAlignment: Text.AlignVCenter
         wrapMode: Text.WordWrap
         anchors.right: parent.right
diff --git a/features/Onboarding.qml b/features/Onboarding.qml
index b4239f4..38e9cf9 100644
--- a/features/Onboarding.qml
+++ b/features/Onboarding.qml
@@ -2,5 +2,11 @@ import QtQuick 2.4
 
 OnboardingForm {
     objectName: "onboarding"
-    loginButton.onClicked: contentView.push("Login.qml")
+    loginButton.onClicked: pageView.push("LoginEmail.qml")
 }
+
+/*##^##
+Designer {
+    D{i:0;autoSize:true;height:480;width:640}
+}
+##^##*/