add config-cxx to client

.gitmodules

@@ -4,9 +4,6 @@
 [submodule "externals/loguru"]
 	path = externals/loguru
 	url = https://github.com/emilk/loguru.git
-[submodule "externals/dotenv-cpp"]
-	path = externals/dotenv-cpp
-	url = https://github.com/laserpants/dotenv-cpp.git
 [submodule "externals/json"]
 	path = externals/json
 	url = https://github.com/nlohmann/json.git

CMakeLists.txt

@@ -18,7 +18,6 @@ add_subdirectory(externals)
 
 set(GMOCK_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/externals/googletest/googlemock/include")
 set(GTEST_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/externals/googletest/googletest/include")
-set(DOTENV_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/externals/dotenv-cpp/include")
 
 enable_testing()
 

apps/client/CMakeLists.txt

@@ -5,7 +5,7 @@ set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
 set(SOURCES
-        config/ConfigProvider.cpp
+        core/configProvider/ConfigProvider.cpp
         api/SessionImpl.cpp
         api/SocketConnectorImpl.cpp
         api/MessageFactoryImpl.cpp
@@ -126,6 +126,7 @@ target_link_libraries(${EXECUTABLE_NAME} PUBLIC
         collection
         envParser
         fmt::fmt
+        config-cxx
 )
 
 target_include_directories(${EXECUTABLE_NAME} PUBLIC ${GMOCK_INCLUDE_DIR} ${DOTENV_INCLUDE_DIR})
@@ -148,6 +149,7 @@ target_link_libraries(${EXECUTABLE_NAME}UT PUBLIC
         envParser
         faker-cxx
         fmt::fmt
+        config-cxx
 )
 
 target_include_directories(${EXECUTABLE_NAME}UT PUBLIC ${GMOCK_INCLUDE_DIR})

apps/client/Main.cpp

@@ -8,27 +8,22 @@
 #include "api/SessionImpl.h"
 #include "api/SocketConnectorImpl.h"
 #include "common/filesystem/GetProjectPath.h"
-#include "config/ConfigProvider.h"
+#include "core/configProvider/ConfigProvider.h"
 #include "gui/qml/LoaderController.h"
 #include "gui/states/StateFactory.h"
 #include "gui/states/StateMachine.h"
-#include "laserpants/dotenv/dotenv.h"
 #include "loguru.hpp"
 #include "messages/MessageReaderImpl.h"
 #include "messages/MessageSenderImpl.h"
 #include "messages/MessageSerializerImpl.h"
 
 int main(int argc, char* argv[])
 {
-    auto dotEnvPath = common::filesystem::getProjectPath("chatroom") + "/apps/client/.env";
-
-    dotenv::init(dotEnvPath.c_str());
-
     loguru::g_preamble_date = false;
 
     loguru::init(argc, argv);
 
-    client::config::ConfigProvider configProvider;
+    client::core::ConfigProvider configProvider;
 
     const auto serverHost = configProvider.getServerHost();
 
@@ -65,5 +60,5 @@ int main(int argc, char* argv[])
 
     std::thread api{[&] { context.run(); }};
 
-    return app.exec();
+    return QGuiApplication::exec();
 }

apps/client/config/custom-environment-variables.json

@@ -0,0 +1,6 @@
+{
+  "server": {
+    "host": "SERVER_HOST",
+    "port": "SERVER_PORT"
+  }
+}

apps/client/config/default.json

@@ -0,0 +1,6 @@
+{
+  "server": {
+    "host": "127.0.0.1",
+    "port": 3000
+  }
+}

apps/client/core/configProvider/ConfigProvider.cpp

@@ -0,0 +1,18 @@
+#include "ConfigProvider.h"
+
+#include "envParser/EnvironmentParser.h"
+
+namespace client::core
+{
+ConfigProvider::ConfigProvider() : config{std::make_unique<config::Config>()} {}
+
+std::string ConfigProvider::getServerHost() const
+{
+    return config->get<std::string>("server.host");
+}
+
+int ConfigProvider::getServerPort() const
+{
+    return config->get<int>("server.port");
+}
+}

apps/client/core/configProvider/ConfigProvider.h

@@ -0,0 +1,21 @@
+#pragma once
+
+#include <memory>
+#include <string>
+
+#include "config-cxx/Config.h"
+
+namespace client::core
+{
+class ConfigProvider
+{
+public:
+    ConfigProvider();
+
+    std::string getServerHost() const;
+    int getServerPort() const;
+
+private:
+    std::unique_ptr<config::Config> config;
+};
+}

apps/server/Main.cpp

@@ -4,7 +4,6 @@
 
 #include "common/filesystem/GetProjectPath.h"
 #include "fmt/format.h"
-#include "laserpants/dotenv/dotenv.h"
 #include "loguru.hpp"
 #include "server/core/configProvider/ConfigProvider.h"
 #include "server/core/database/DatabaseConnectionFactory.h"

externals/CMakeLists.txt

@@ -2,7 +2,6 @@ set(LOGURU_WITH_STREAMS 1)
 set(LOGURU_THREADNAME_WIDTH 11)
 set(LOGURU_FILENAME_WIDTH 30)
 add_subdirectory(loguru)
-add_subdirectory(dotenv-cpp)
 set(BUILD_FAKER_TESTS OFF)
 add_subdirectory(faker-cxx)
 add_subdirectory(cpr)