Styles was added

services/beerservice.cpp

@@ -7,14 +7,8 @@
 #include <QFile>
 #include <QDebug>
 
-namespace {
-
-constexpr auto GuestUserId = "2641ffe8cd4311eda27f0242ac120002";
-
-}
-
-BeerService::BeerService(QObject *parent)
-    : QObject{parent}
+BeerService::BeerService()
+    : QObject{nullptr}
 {
     restoreStash();
 
@@ -59,8 +53,7 @@ void BeerService::connectSrv(const QString &userId)
     }
 
     QNetworkRequest request(QUrl("ws://195.133.196.161:8000"));
-    QString authString = QString("%1:pass").arg(userId.isEmpty() ? GuestUserId : userId);
-    request.setRawHeader("Authorization", "Basic " + authString.toLatin1().toBase64());
+    request.setRawHeader("Authorization", "Basic " + QString("%1:pass").arg(userId).toLatin1().toBase64());
     m_socket.open(request);
 }
 

services/beerservice.h

@@ -9,14 +9,21 @@ class BeerService : public QObject
     Q_OBJECT
 
 public:
-    explicit BeerService(QObject *parent = nullptr);
-    ~BeerService();
+    static BeerService *instance()
+    {
+        static BeerService i;
+        return &i;
+    }
 
     Q_INVOKABLE void connectSrv(const QString &userId = QString());
-    Q_INVOKABLE void sendCommand(const QString &entity, const QString &action, const QVariantMap &data = QVariantMap());
-    Q_INVOKABLE void connectListener(QObject *listener);
+
+    void sendCommand(const QString &entity, const QString &action, const QVariantMap &data = QVariantMap());
+    void connectListener(QObject *listener);
 
 private:
+    BeerService();
+    ~BeerService();
+
     QString stashFileName() const;
     void saveStash() const;
     void restoreStash();

services/settingsservice.cpp

@@ -1,5 +1,11 @@
 #include "settingsservice.h"
 
+namespace Defaults {
+
+constexpr auto GuestUserId = "2641ffe8cd4311eda27f0242ac120002";
+
+}
+
 QVariant SettingsService::value(const QString &key, const QVariant &defaultValue) const
 {
     return m_settings.value(key, defaultValue);
@@ -9,3 +15,13 @@ void SettingsService::setValue(const QString &key, const QVariant &value)
 {
     m_settings.setValue(key, value);
 }
+
+QString SettingsService::selectedUserId() const
+{
+    return m_settings.value("selected_user", Defaults::GuestUserId).toString();
+}
+
+void SettingsService::setSelectedUserId(const QString &userId)
+{
+    m_settings.setValue("selected_user", userId);
+}

services/settingsservice.h

@@ -9,6 +9,9 @@ public:
     QVariant value(const QString &key, const QVariant &defaultValue = QVariant()) const;
     void setValue(const QString &key, const QVariant &value);
 
+    QString selectedUserId() const;
+    void setSelectedUserId(const QString &userId);
+
 private:
     QSettings m_settings = QSettings("DedSoft", "BeerLog");
 };