Remove WelcomeScreen and refactor login functionality.

- Removed Presentation.Welcome from futr.cabal and refactored login handling to KeyMgmt. - Deleted WelcomeScreen from QML resources and adjusted KeyMgmtScreen for account handling. - Moved welcome-related logic, such as seed phrase generation and account imports, to KeyMgmt context.
futrnostr · Aug 22, 2024 · f0b1d6e · f0b1d6e
1 parent 5592064
commit f0b1d6e
Show file tree

Hide file tree

Showing 9 changed files with 156 additions and 413 deletions.
diff --git a/futr.cabal b/futr.cabal
@@ -34,7 +34,6 @@ executable futr
         Nostr.Profile
         Nostr.Relay
         Presentation.KeyMgmt
-        Presentation.Welcome
         Types
 
     default-language: Haskell2010

diff --git a/resources/qml/content/App.qml b/resources/qml/content/App.qml
@@ -55,12 +55,6 @@ ApplicationWindow {
                 visible: currentScreen == "KeyMgmt"
             }
 
-            WelcomeScreen {
-                anchors.margins: 10
-                anchors.fill: parent
-                visible: currentScreen == "Welcome"
-            }
-
             HomeScreen {
                 anchors.margins: 10
                 anchors.fill: parent

diff --git a/resources/qml/content/KeyMgmtScreen.ui.qml b/resources/qml/content/KeyMgmtScreen.ui.qml
@@ -95,7 +95,7 @@ Rectangle {
                                 onExited: parent.parent.parent.mouseHover = false
 
                                 onClicked: {
-                                    ctxKeyMgmt.selectAccount(modelData.npub)
+                                    login(modelData.npub)
                                 }
                             }
                         }
@@ -135,7 +135,7 @@ Rectangle {
                                 onExited: parent.parent.parent.mouseHover = false
 
                                 onClicked: {
-                                    ctxKeyMgmt.selectAccount(modelData.npub)
+                                    login(modelData.npub)
                                 }
                             }
                         }
@@ -191,7 +191,7 @@ Rectangle {
                 Layout.rightMargin: 30
 
                 onClicked: function () {
-                    ctxWelcome.generateSeedphrase()
+                    ctxKeyMgmt.generateSeedphrase()
                     keysGeneratedDialog.visible = true
                 }
             }
@@ -250,15 +250,15 @@ Rectangle {
                         id: radionsec
                         checked: true
                         Layout.alignment: Qt.AlignLeft
-                        onClicked: ctxWelcome.errorMsg = ""
+                        onClicked: ctxKeyMgmt.errorMsg = ""
                     }
 
                     RadioButton {
                         text: qsTr("Import from seedphrase")
                         id: radioseedphrase
                         checked: false
                         Layout.alignment: Qt.AlignRight
-                        onClicked: ctxWelcome.errorMsg = ""
+                        onClicked: ctxKeyMgmt.errorMsg = ""
                     }
                 }
 
@@ -288,7 +288,7 @@ Rectangle {
 
                 Text {
                     id: errorMessage
-                    text: ctxWelcome.errorMsg
+                    text: ctxKeyMgmt.errorMsg
                     color: "red"
                     visible: errorMessage != ""
                     Layout.alignment: Qt.AlignLeft
@@ -312,10 +312,17 @@ Rectangle {
                         target: importbutton
                         onClicked: function () {
                             if (radionsec.checked) {
-                                ctxWelcome.importSecretKey(secretkey.text)
+                                var res = ctxKeyMgmt.importSecretKey(secretkey.text);
+                                if (res !== null) {
+                                    login(res)
+                                    importAccountDialog.visible = false
+                                }
                             } else if (radioseedphrase.checked) {
-                                ctxWelcome.importSeedphrase(seedphrase.text,
-                                                    password.text)
+                                var res = ctxKeyMgmt.importSeedphrase(seedphrase.text, password.text)
+                                if (res !== null) {
+                                    login(res)
+                                    importAccountDialog.visible = false
+                                }
                             }
                         }
                     }
@@ -386,7 +393,7 @@ Rectangle {
 
                     TextArea {
                         id: seedPhraseText
-                        text: ctxWelcome.seedphrase
+                        text: ctxKeyMgmt.seedphrase
                         Layout.fillWidth: true
                         font: Constants.font
                         readOnly: true
@@ -427,7 +434,7 @@ Rectangle {
 
                     TextArea {
                         id: privateKeyText
-                        text: ctxWelcome.nsec
+                        text: ctxKeyMgmt.nsec
                         Layout.fillWidth: true
                         readOnly: true
                         wrapMode: Text.Wrap
@@ -467,7 +474,7 @@ Rectangle {
 
                     TextArea {
                         id: publicKeyText
-                        text: ctxWelcome.npub
+                        text: ctxKeyMgmt.npub
                         Layout.fillWidth: true
                         readOnly: true
                         wrapMode: Text.Wrap

diff --git a/resources/qml/content/WelcomeScreen.ui.qml b/resources/qml/content/WelcomeScreen.ui.qml
diff --git a/resources/qml/content/qmldir b/resources/qml/content/qmldir
@@ -1,6 +1,4 @@
 module content
 App 1.0 App.qml
 HomeScreen 1.0 HomeScreen.ui.qml
-KeysGeneratedScreen 1.0 KeysGeneratedScreen.ui.qml
-KeyMgmtScreen 1.0 KeyMgmtScreen.ui.qml
-WelcomeScreen 1.0 WelcomeScreen.ui.qml
+KeyMgmtScreen 1.0 KeyMgmtScreen.ui.qml