diff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | Login.qml | 8 | ||||
| -rw-r--r-- | kelakon.qrc | 4 | ||||
| m--------- | larva | 0 |
4 files changed, 10 insertions, 5 deletions
diff --git a/.gitmodules b/.gitmodules index 24679ea..186a75a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "qrtclient"] path = qrtclient url = git@github.com:darapsa/qrtclient.git +[submodule "larva"] + path = larva + url = git@github.com:darapsa/larva.git @@ -1,6 +1,7 @@ import QtQuick 2.12 +import "larva/features" -LoginForm { +OnboardingForm { signal logIn(string name, string password) signal userNew(string name, string password, string emailAddress , string realName) @@ -12,6 +13,7 @@ LoginForm { objectName: "login" width: appWindow.width height: appWindow.height - googleButton.onClicked: stackView.push("qrc:/pages/LoginName.qml") - emailButton.onClicked: stackView.push("qrc:/pages/Email.qml") + logoImage.source: "kelakon-logo.png" + registerButton.onClicked: stackView.push("qrc:/pages/Email.qml") + loginButton.onClicked: stackView.push("qrc:/pages/LoginName.qml") } diff --git a/kelakon.qrc b/kelakon.qrc index b4e44ca..842e25c 100644 --- a/kelakon.qrc +++ b/kelakon.qrc @@ -2,9 +2,9 @@ <qresource prefix="/"> <file>main.qml</file> <file>Login.qml</file> - <file>LoginForm.ui.qml</file> + <file>larva/features/OnboardingForm.ui.qml</file> <file>kelakon-logo.png</file> - <file>onboarding-1.png</file> + <file>larva/components/images/onboarding-1.png</file> <file>pages/Email.qml</file> <file>pages/EmailForm.ui.qml</file> <file>assets/arrow-back-24px.svg</file> diff --git a/larva b/larva new file mode 160000 +Subproject 3db1edb860b13171c2a82319f42f2500d6007bc |