From 04c8eea185ba1ce2e1a26c6ab1de145f0b5e95c2 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: Wed, 18 Sep 2019 09:34:51 +0800 Subject: Add larva as a submodule --- .gitmodules | 3 +++ Login.qml | 8 +++++--- kelakon.qrc | 4 ++-- larva | 1 + 4 files changed, 11 insertions(+), 5 deletions(-) create mode 160000 larva 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 diff --git a/Login.qml b/Login.qml index 8a0e7f0..14dc174 100644 --- a/Login.qml +++ b/Login.qml @@ -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 @@ main.qml Login.qml - LoginForm.ui.qml + larva/features/OnboardingForm.ui.qml kelakon-logo.png - onboarding-1.png + larva/components/images/onboarding-1.png pages/Email.qml pages/EmailForm.ui.qml assets/arrow-back-24px.svg diff --git a/larva b/larva new file mode 160000 index 0000000..3db1edb --- /dev/null +++ b/larva @@ -0,0 +1 @@ +Subproject commit 3db1edb860b13171c2a82319f42f2500d6007bc4 -- cgit v1.2.3