src/CMakeLists.txt

@@ -10,9 +10,7 @@ qt_add_qml_module(${PROJECT_NAME}
         database.cpp database.h
     QML_FILES
         ErrorNotification.qml
-        LoginPage.qml
         Main.qml
-        ReservationsPage.qml
         SelectableLabel.qml
 )
 

src/ErrorNotification.qml

@@ -1,4 +1,3 @@
-pragma ComponentBehavior: Bound
 import QtQuick
 import QtQuick.Controls
 

src/LoginPage.qml

@@ -1,59 +0,0 @@
-pragma ComponentBehavior: Bound
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-
-Page {
-    id: page
-
-    title: qsTr("Login")
-
-    ColumnLayout {
-        Label {
-            text: qsTr("&User:")
-        }
-
-        TextField {
-            id: user
-
-            focus: true
-
-            validator: RegularExpressionValidator {
-                regularExpression: /[^s].*/
-            }
-
-            onAccepted: function () {
-                loginAction.trigger();
-            }
-        }
-
-        Label {
-            text: qsTr("&Password:")
-        }
-
-        TextField {
-            id: password
-
-            echoMode: TextInput.Password
-
-            onAccepted: function () {
-                loginAction.trigger();
-            }
-        }
-
-        Button {
-            action: loginAction
-        }
-    }
-
-    Action {
-        id: loginAction
-
-        enabled: user.acceptableInput
-        text: "&Login"
-
-        onTriggered: function () {
-            Database.open(user.text, password.text);
-        }
-    }
-}

src/Main.qml

@@ -1,35 +1,49 @@
-pragma ComponentBehavior: Bound
 import QtQuick
 import QtQuick.Controls
+import QtQuick.Layouts
 import Camper
 
 ApplicationWindow {
     height: 480
-    title: pageStack.title ? qsTr("%1 — Camper").arg(pageStack.title) : qsTr("Camper")
+    title: qsTr("Camper")
     visible: true
     width: 640
 
-    StackView {
+    ColumnLayout {
-        id: pageStack
+        Label {
+            text: qsTr("&User:")
+        }
 
-        property string title: (currentItem as Page)?.title ?? ""
+        TextField {
+            id: user
 
-        anchors.fill: parent
             focus: true
-        initialItem: loginPage
+
+            validator: RegularExpressionValidator {
+                regularExpression: /[^s].*/
             }
 
-    Component {
+            onAccepted: function () {
-        id: loginPage
+                loginAction.trigger();
-
-        LoginPage {
             }
         }
 
-    Component {
+        Label {
-        id: reservationsPage
+            text: qsTr("&Password:")
+        }
 
-        ReservationsPage {
+        TextField {
+            id: password
+
+            echoMode: TextInput.Password
+
+            onAccepted: function () {
+                loginAction.trigger();
+            }
+        }
+
+        Button {
+            action: loginAction
         }
     }
 
@@ -45,19 +59,22 @@ ApplicationWindow {
         }
     }
 
-    Connections {
+    Action {
-        function onClosed() {
+        id: loginAction
-            pageStack.replace(null, loginPage);
+
+        enabled: user.acceptableInput
+        text: "&Login"
+
+        onTriggered: function () {
+            Database.open(user.text, password.text);
+        }
     }
 
+    Connections {
         function onErrorOcurred(errorMessage) {
             errorNotification.show(errorMessage);
         }
 
-        function onOpened() {
-            pageStack.replace(reservationsPage);
-        }
-
         target: Database
     }
 }

src/ReservationsPage.qml

@@ -1,23 +0,0 @@
-pragma ComponentBehavior: Bound
-import QtQuick
-import QtQuick.Controls
-
-Page {
-    title: qsTr("Reservations")
-
-    Button {
-        action: logoutAction
-    }
-
-    Action {
-        id: logoutAction
-
-        icon.name: "system-log-out"
-        shortcut: "Ctrl+L"
-        text: qsTr("&Log out")
-
-        onTriggered: function () {
-            Database.close();
-        }
-    }
-}

src/SelectableLabel.qml

@@ -1,4 +1,3 @@
-pragma ComponentBehavior: Bound
 import QtQuick
 import QtQuick.Controls
 

src/database.cpp

@@ -6,7 +6,6 @@
 Database::Database(QObject *parent)
     : QObject{parent}
     , m_pool{}
-    , m_connectionName{"main"}
 {
     m_pool.setMaxThreadCount(1);
     m_pool.setExpiryTimeout(-1);
@@ -15,30 +14,16 @@ Database::Database(QObject *parent)
 QFuture<void> Database::open(const QString &user, const QString &password)
 {
     return QtConcurrent::run(&m_pool, [this, user, password]() {
-        QSqlDatabase db = QSqlDatabase::addDatabase("QPSQL", m_connectionName);
+        QString connectionName("main");
+        QSqlDatabase db = QSqlDatabase::addDatabase("QPSQL", connectionName);
         db.setConnectOptions("service=camper; options=-csearch_path=camper,public");
-        if (db.open(user, password)) {
+        if (!db.open(user, password)) {
-            emit opened();
-        } else {
             const QString errorMessage(db.lastError().text());
             db = QSqlDatabase(); // Otherwise removeDatabase complains is still being used.
-            QSqlDatabase::removeDatabase(m_connectionName);
+            QSqlDatabase::removeDatabase(connectionName);
             emit errorOcurred(errorMessage);
         }
     });
 }
 
-QFuture<void> Database::close()
-{
-    return QtConcurrent::run(&m_pool, [this]() {
-        QSqlDatabase db = QSqlDatabase::database(m_connectionName);
-        if (!db.isValid()) {
-            return;
-        }
-        db.close();
-        QSqlDatabase::removeDatabase(m_connectionName);
-        emit closed();
-    });
-}
-
 #include "moc_database.cpp"

src/database.h

@@ -16,16 +16,12 @@ public:
     explicit Database(QObject *parent = nullptr);
 
     Q_INVOKABLE QFuture<void> open(const QString &user, const QString &password);
-    Q_INVOKABLE QFuture<void> close();
 
 signals:
-    void closed();
     void errorOcurred(const QString &errorMessage);
-    void opened();
 
 private:
     QThreadPool m_pool;
-    QString m_connectionName;
 };
 
 #endif // DATABASE_H