Replaced UIs whose replacements are ready in Larva

and reorganise logical QML files

11 files changed, 6 insertions, 141 deletions

diff --git a/pages/ConfirmPassword.qml b/pages/ConfirmPassword.qml
deleted file mode 100644
index 6d37be7..0000000
--- a/pages/ConfirmPassword.qml
+++ /dev/null
@@ -1,24 +0,0 @@
-import QtQuick 2.12
-import KelakonUser 0.1
-
-PasswordForm {
-	width: stackView.width
-	height: stackView.height
-	backButton.onClicked: stackView.pop()
-	userEmail.y: 292
-	instructionLabel.text: qsTr("Re-Enter password")
-	emailAddressLabel.text: User.name
-
-	passTextField {
-		placeholderText: qsTr("Re-enter Password")
-		onTextChanged:
-			if (passTextField.text == User.password)
-				createPassButton.enabled = true
-	}
-
-	createPassButton {
-		enabled: false
-		text: qsTr("Confirm password")
-		onClicked: stackView.push("qrc:/pages/CreateProfile.qml")
-	}
-}
diff --git a/pages/CreateProfile.qml b/pages/CreateProfile.qml
deleted file mode 100644
index 7d499e2..0000000
--- a/pages/CreateProfile.qml
+++ /dev/null
@@ -1,18 +0,0 @@
-import QtQuick 2.12
-import KelakonUser 0.1
-
-CreateProfileForm {
-	width: stackView.width
-	height: stackView.height
-	backButton.onClicked: stackView.pop()
-	skipButton.onClicked: {
-		stackView.push("qrc:/pages/Home.qml")
-	}
-	emailAddressLabel.text: User.emailAddress
-	startUsingKelakon.onClicked: {
-		User.name = userNameLabel.text
-		User.realName = enterFullName.text
-		login.ticketNew("Kelakon", User.realName + " <" + User.emailAddress
-		+ ">")
-	}
-}
diff --git a/pages/CreateProfileForm.ui.qml b/pages/CreateProfileForm.ui.qml
index ac594c8..2eec4d7 100644
--- a/pages/CreateProfileForm.ui.qml
+++ b/pages/CreateProfileForm.ui.qml
@@ -12,6 +12,7 @@ Rectangle {
     property alias skipButton: skipButton
     property alias enterFullName: enterFullName
     property alias userNameLabel: userNameLabel
+    property alias emailImage: emailImage
     property alias emailAddressLabel: emailAddressLabel
     property alias startUsingKelakon: startUsingKelakon
 
@@ -74,6 +75,7 @@ Rectangle {
         spacing: 8
 
         Image {
+            id: emailImage
             width: 24
             height: 24
             opacity: 0.54
diff --git a/pages/Email.qml b/pages/Email.qml
deleted file mode 100644
index 0919437..0000000
--- a/pages/Email.qml
+++ /dev/null
@@ -1,18 +0,0 @@
-import QtQuick 2.12
-import KelakonUser 0.1
-
-EmailForm {
-	width: stackView.width
-	height: stackView.height
-	backButton.onClicked: stackView.pop()
-
-	emailTextField.onTextChanged: {
-		if (!emailTextField.text || !loginButton.enabled)
-			loginButton.enabled = !loginButton.enabled
-	}
-
-	loginButton.onClicked: {
-		User.emailAddress = emailTextField.text
-		stackView.push("qrc:/pages/Password.qml")
-	}
-}
diff --git a/pages/EmailForm.ui.qml b/pages/EmailForm.ui.qml
index 26f124c..0f22dbc 100644
--- a/pages/EmailForm.ui.qml
+++ b/pages/EmailForm.ui.qml
@@ -10,6 +10,7 @@ Rectangle {
 
     property alias backButton: backButton
     property alias instructionLabel: instructionLabel
+    property alias emailImage: emailImage
     property alias emailTextField: emailTextField
     property alias loginButton: loginButton
 
@@ -74,6 +75,7 @@ Rectangle {
         spacing: 8
 
         Image {
+	    id: emailImage
             width: 24
             height: 24
             opacity: 0.54
diff --git a/pages/Home.qml b/pages/Home.qml
deleted file mode 100644
index 533b1b8..0000000
--- a/pages/Home.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import QtQuick 2.12
-
-HomeForm {
-	width: stackView.width
-	height: stackView.height
-	menuButton.onClicked: drawer.visible = !drawer.visible
-}
diff --git a/pages/LoginName.qml b/pages/LoginName.qml
deleted file mode 100644
index 9294056..0000000
--- a/pages/LoginName.qml
+++ /dev/null
@@ -1,19 +0,0 @@
-import QtQuick 2.12
-import KelakonUser 0.1
-
-EmailForm {
-	width: stackView.width
-	height: stackView.height
-	backButton.onClicked: stackView.pop()
-    instructionLabel.text: qsTr("Enter your email")
-
-	emailTextField.onTextChanged: {
-		if (!emailTextField.text || !loginButton.enabled)
-			loginButton.enabled = !loginButton.enabled
-	}
-
-	loginButton.onClicked: {
-		User.name = emailTextField.text
-		stackView.push("qrc:/pages/LoginPass.qml")
-	}
-}
diff --git a/pages/LoginPass.qml b/pages/LoginPass.qml
deleted file mode 100644
index 9e5d2f4..0000000
--- a/pages/LoginPass.qml
+++ /dev/null
@@ -1,20 +0,0 @@
-import QtQuick 2.12
-import KelakonUser 0.1
-
-PasswordForm {
-	width: stackView.width
-	height: stackView.height
-	backButton.onClicked: stackView.pop()
-	instructionLabel.text: qsTr("Enter password")
-	emailAddressLabel.text: User.name
-
-	passTextField.onTextChanged: {
-		if (!passTextField.text || !createPassButton.enabled)
-			createPassButton.enabled = !createPassButton.enabled
-	}
-
-	createPassButton.onClicked: {
-		User.password = passTextField.text
-		onClicked: login.logIn(User.name, User.password)
-	}
-}
diff --git a/pages/Password.qml b/pages/Password.qml
deleted file mode 100644
index 0b042c5..0000000
--- a/pages/Password.qml
+++ /dev/null
@@ -1,19 +0,0 @@
-import QtQuick 2.12
-import KelakonUser 0.1
-
-PasswordForm {
-	width: stackView.width
-	height: stackView.height
-	backButton.onClicked: stackView.pop()
-	emailAddressLabel.text: User.name
-
-	passTextField.onTextChanged: {
-		if (!passTextField.text || !createPassButton.enabled)
-			createPassButton.enabled = !createPassButton.enabled
-	}
-
-	createPassButton.onClicked: {
-		User.password = passTextField.text
-		stackView.push("qrc:/pages/ConfirmPassword.qml")
-	}
-}
diff --git a/pages/PasswordForm.ui.qml b/pages/PasswordForm.ui.qml
index d4849fd..011af8c 100644
--- a/pages/PasswordForm.ui.qml
+++ b/pages/PasswordForm.ui.qml
@@ -11,6 +11,7 @@ Rectangle {
     property alias backButton: backButton
     property alias instructionLabel: instructionLabel
     property alias userEmail: userEmail
+    property alias passImage: passImage
     property alias passTextField: passTextField
     property alias createPassButton: createPassButton
     property alias emailAddressLabel: emailAddressLabel
@@ -107,6 +108,7 @@ Rectangle {
         height: 56
 
         Image {
+            id: passImage
             width: 24
             height: 24
             opacity: 0.54
diff --git a/pages/Profile.qml b/pages/Profile.qml
deleted file mode 100644
index b72b108..0000000
--- a/pages/Profile.qml
+++ /dev/null
@@ -1,16 +0,0 @@
-import QtQuick 2.12
-import KelakonUser 0.1
-
-CreateProfileForm {
-	width: stackView.width
-	height: stackView.height
-	backButton.onClicked: stackView.pop()
-	titleLabel.text: qsTr("Edit Profile")
-	skipButton.onClicked: {
-		login.ticketSearch(User.name)
-		stackView.push("qrc:/pages/Home.qml")
-	}
-	enterFullName.text: User.realName
-	userNameLabel.text: User.name
-	emailAddressLabel.text: User.emailAddress
-}