From 13dfbeddc02162d9329495997dfe98dfe4495861 Mon Sep 17 00:00:00 2001
From: Sven Luethi <dev@svenluthi.com>
Date: Sat, 3 Apr 2021 00:18:53 +0200
Subject: [PATCH] adds ui namespace module

---
 src/CMakeLists.txt                       |  1 +
 src/{core => cluster}/include/Ledger.hpp |  0
 src/core/CMakeLists.txt                  |  2 +-
 src/core/main.cpp                        | 10 ++++---
 src/resolver/Server.cpp                  |  2 ++
 src/ui/CMakeLists.txt                    |  6 +++++
 src/ui/Server.cpp                        | 25 ++++++++++++++++++
 src/ui/include/Server.hpp                | 33 ++++++++++++++++++++++++
 src/ui/include/UI.hpp                    |  5 ++++
 9 files changed, 79 insertions(+), 5 deletions(-)
 rename src/{core => cluster}/include/Ledger.hpp (100%)
 create mode 100644 src/ui/CMakeLists.txt
 create mode 100644 src/ui/Server.cpp
 create mode 100644 src/ui/include/Server.hpp
 create mode 100644 src/ui/include/UI.hpp

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 17fc9f6..20ea2ac 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,5 +3,6 @@ add_subdirectory(resolver)
 add_subdirectory(dhcp)
 add_subdirectory(api)
 add_subdirectory(cluster)
+add_subdirectory(ui)
 
 
diff --git a/src/core/include/Ledger.hpp b/src/cluster/include/Ledger.hpp
similarity index 100%
rename from src/core/include/Ledger.hpp
rename to src/cluster/include/Ledger.hpp
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 695eb12..1719d12 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -8,4 +8,4 @@ add_subdirectory(storage)
 
 # Build Executable:
 add_executable(Plains main.cpp)
-target_link_libraries(Plains PRIVATE Core DNS Storage Resolver DHCP API Cluster)
+target_link_libraries(Plains PRIVATE Core DNS Storage Resolver DHCP API Cluster UI)
diff --git a/src/core/main.cpp b/src/core/main.cpp
index e7dcf39..8de7457 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -1,5 +1,6 @@
-#include "Resolver.hpp"
 #include "Core.hpp"
+#include "UI.hpp"
+#include "Resolver.hpp"
 #include "DNS.hpp"
 #include <vector>
 #include <string>
@@ -14,7 +15,7 @@ using std::string;
 int main(int args, char **argv) {
     Logger logger(Logger::DEBUG);
 
-    logger.info.ln ("Starting PlaiNS...");
+    logger.info.ln ("Starting PLAINS...");
 
     vector<string> arguments;
     for ( unsigned index = 0; index < args; ++index ) {
@@ -25,6 +26,7 @@ int main(int args, char **argv) {
     {
         ConfigManager    cfg(logger, arguments);
         EventBus         eventBus(logger);
+	UI::Server       uiServer(logger, eventBus);
         Resolver::Server resolver(logger, eventBus);
 
         /*
@@ -53,9 +55,9 @@ int main(int args, char **argv) {
         // End of Testcode
 
         //resolver.run();
-        logger.info.ln ("PlaiNS successfully started.");
+        logger.info.ln ("PLAINS successfully started.");
         // Run something on main thread...
-        logger.info.ln ("Shutting down PlaiNS. Good Bye!");  
+        logger.info.ln ("Shutting down PLAINS. Good Bye!");  
     }
     catch (Exception& e) {
         logger.fatal << "Uncaught Exception: " << e.what() << Logger::commit;
diff --git a/src/resolver/Server.cpp b/src/resolver/Server.cpp
index eea877b..bf86d44 100644
--- a/src/resolver/Server.cpp
+++ b/src/resolver/Server.cpp
@@ -98,7 +98,9 @@ Server::Server(Logger& logger, EventBus& eventBus)
 }
 
 Server::~Server() {
+    _logger.debug.ln ("Stopping Resolver...");
     _udpSocket->close();
+    _logger.debug.ln ("Resolver stopped");
 }
 
 //void Server::run() {
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
new file mode 100644
index 0000000..52d783b
--- /dev/null
+++ b/src/ui/CMakeLists.txt
@@ -0,0 +1,6 @@
+
+add_library(UI OBJECT Server.cpp)
+
+target_include_directories(UI PUBLIC include)
+
+target_link_libraries(UI PRIVATE Core DNS PUBLIC Asio)
diff --git a/src/ui/Server.cpp b/src/ui/Server.cpp
new file mode 100644
index 0000000..69524f7
--- /dev/null
+++ b/src/ui/Server.cpp
@@ -0,0 +1,25 @@
+#include "Server.hpp"
+
+namespace Plains {
+namespace UI {
+
+using asio::ip::tcp;
+
+Server::Server(Logger& logger, EventBus& eventBus)
+  : _logger(logger),
+    _eventBus(eventBus)
+{
+    _logger.debug.ln ("Starting UI Webserver...");
+    _logger.debug.ln ("UI Webserver started");
+}
+
+Server::~Server() {
+    _logger.debug.ln ("Stopping UI Webserver...");
+    _logger.debug.ln ("UI Webserver stopped");
+}
+
+
+
+
+
+}}
diff --git a/src/ui/include/Server.hpp b/src/ui/include/Server.hpp
new file mode 100644
index 0000000..3cfaf6c
--- /dev/null
+++ b/src/ui/include/Server.hpp
@@ -0,0 +1,33 @@
+#ifndef UI_SERVER_HPP
+#define UI_SERVER_HPP
+#include "asio.hpp"
+#include "Core.hpp"
+
+namespace Plains {
+namespace UI {
+
+using Core::EventBus;
+using Core::Logger;
+using Core::Exception;
+
+
+class Server
+{
+    private:
+    EventBus& _eventBus;
+    Logger& _logger;
+    asio::io_context _ioContext;
+    asio::ip::tcp::endpoint _sender_endpoint;
+
+    public:
+    Server(Logger& logger, EventBus& eventBus);
+    ~Server();
+};
+
+
+
+
+
+}}
+
+#endif
diff --git a/src/ui/include/UI.hpp b/src/ui/include/UI.hpp
new file mode 100644
index 0000000..5fc3c5d
--- /dev/null
+++ b/src/ui/include/UI.hpp
@@ -0,0 +1,5 @@
+#ifndef UI_HPP
+#define UI_HPP
+#include "Server.hpp"
+//Include further classes here
+#endif