7 files changed, 19 insertions, 52 deletions
diff --git a/src/main/resources/templates/configs.html b/src/main/resources/templates/configs.html
index 1c8b1d3..b94257a 100644
--- a/src/main/resources/templates/configs.html
+++ b/src/main/resources/templates/configs.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="UTF-8">
     <title>ETL-Prozessor</title>
-    <link rel="stylesheet" th:href="@{/style.css}" />
+    <link rel="stylesheet" th:href="@{/main.css}"/>
 </head>
 <body>
     <div th:replace="~{fragments.html :: nav}"></div>
@@ -115,9 +115,7 @@
         </div>
     </main>
     <footer th:replace="~{fragments.html :: footer}"></footer>
-    <script th:src="@{/scripts.js}"></script>
-    <script th:src="@{/webjars/htmx.org/dist/htmx.min.js}"></script>
-    <script th:src="@{/webjars/htmx.org/dist/ext/sse.js}"></script>
+    <script th:src="@{/main.js}"></script>
     <script>
         function selectTab(self, elem) {
             Array.from(document.getElementsByClassName('tab')).forEach(e => e.className = 'tab');
diff --git a/src/main/resources/templates/errors/404.html b/src/main/resources/templates/errors/404.html
index 713239d..c08c503 100644
--- a/src/main/resources/templates/errors/404.html
+++ b/src/main/resources/templates/errors/404.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="UTF-8">
     <title>ETL-Prozessor</title>
-    <link rel="stylesheet" th:href="@{/style.css}" />
+    <link rel="stylesheet" th:href="@{/main.css}" />
 </head>
 <body>
     <div th:replace="~{fragments.html :: nav}"></div>
diff --git a/src/main/resources/templates/fragments.html b/src/main/resources/templates/fragments.html
index d3a76e6..ec7e07b 100644
--- a/src/main/resources/templates/fragments.html
+++ b/src/main/resources/templates/fragments.html
@@ -2,7 +2,7 @@
 <html xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.thymeleaf.org">
 <head>
     <meta charset="UTF-8"/>
-    <link rel="stylesheet" th:href="@{/style.css}"/>
+    <link rel="stylesheet" th:href="@{/main.css}"/>
 </head>
 <body>
     <div class="headline" th:fragment="nav">
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index 0f65a7f..16354c6 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="UTF-8">
     <title>ETL-Prozessor</title>
-    <link rel="stylesheet" th:href="@{/style.css}" />
+    <link rel="stylesheet" th:href="@{/main.css}"/>
 </head>
 <body>
     <div th:replace="~{fragments.html :: nav}"></div>
@@ -90,8 +90,7 @@
 
     </main>
     <footer th:replace="~{fragments.html :: footer}"></footer>
-    <script th:src="@{/scripts.js}"></script>
-    <script th:src="@{/webjars/htmx.org/dist/htmx.min.js}"></script>
+    <script th:src="@{/main.js}"></script>
     <script>
         window.addEventListener('load', () => {
             let keyBindings = {
@@ -110,11 +109,13 @@
             };
         });
 
-        const eventSource = new EventSource('statistics/events');
-        eventSource.addEventListener('newrequest', event => {
-            console.log(event);
-            document.getElementById('reload-notify').style.display = 'inline';
-        });
+        window.onload = () => {
+            const eventSource = new EventSource('statistics/events');
+            eventSource.addEventListener('newrequest', event => {
+                console.log(event);
+                document.getElementById('reload-notify').style.display = 'inline';
+            });
+        }
     </script>
 </body>
 </html>
diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html
index 7b56d25..4d855df 100644
--- a/src/main/resources/templates/login.html
+++ b/src/main/resources/templates/login.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="UTF-8">
     <title>ETL-Prozessor</title>
-    <link rel="stylesheet" th:href="@{/style.css}" />
+    <link rel="stylesheet" th:href="@{/main.css}"/>
 </head>
 <body>
     <div th:replace="~{fragments.html :: nav}"></div>
diff --git a/src/main/resources/templates/report.html b/src/main/resources/templates/report.html
index 6ee34ac..552a86c 100644
--- a/src/main/resources/templates/report.html
+++ b/src/main/resources/templates/report.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="UTF-8">
     <title>ETL-Prozessor</title>
-    <link rel="stylesheet" th:href="@{/style.css}" />
+    <link rel="stylesheet" th:href="@{/main.css}"/>
 </head>
 <body>
     <div th:replace="~{fragments.html :: nav}"></div>
@@ -66,6 +66,6 @@
         </table>
     </main>
     <footer th:replace="~{fragments.html :: footer}"></footer>
-    <script th:src="@{/scripts.js}"></script>
+    <script th:src="@{/main.js}"></script>
 </body>
 </html>
 \ No newline at end of file
diff --git a/src/main/resources/templates/statistics.html b/src/main/resources/templates/statistics.html
index af6a6a9..1da382c 100644
--- a/src/main/resources/templates/statistics.html
+++ b/src/main/resources/templates/statistics.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="UTF-8">
     <title>ETL-Prozessor</title>
-    <link rel="stylesheet" th:href="@{/style.css}" />
+    <link rel="stylesheet" th:href="@{/main.css}"/>
 </head>
 <body>
     <div th:replace="~{fragments.html :: nav}"></div>
@@ -39,39 +39,7 @@
 
     </main>
     <footer th:replace="~{fragments.html :: footer}"></footer>
-    <script th:src="@{/webjars/echarts/dist/echarts.min.js}"></script>
-    <script th:src="@{/scripts.js}"></script>
-    <script>
-        window.onload = () => {
-            drawPieChart('statistics/requeststates', 'piechart1', 'Statusverteilung aller Anfragen');
-            drawPieChart('statistics/requestpatientstates', 'piechart2', 'Statusverteilung nach Patient');
-            drawBarChart('statistics/requestslastmonth', 'barchart', 'Anfragen der letzten 30 Tage');
-
-            drawPieChart('statistics/requeststates?delete=true', 'piechartdel1', 'Statusverteilung aller Anfragen');
-            drawPieChart('statistics/requestpatientstates?delete=true', 'piechartdel2', 'Statusverteilung nach Patient');
-            drawBarChart('statistics/requestslastmonth?delete=true', 'barchartdel', 'Anfragen der letzten 30 Tage');
-
-            const eventSource = new EventSource('statistics/events');
-            eventSource.addEventListener('requeststates', event => {
-                drawPieChart('statistics/requeststates', 'piechart1', 'Statusverteilung aller Anfragen', JSON.parse(event.data));
-            });
-            eventSource.addEventListener('requestpatientstates', event => {
-                drawPieChart('statistics/requestpatientstates', 'piechart2', 'Statusverteilung nach Patient', JSON.parse(event.data));
-            });
-            eventSource.addEventListener('requestslastmonth', event => {
-                drawBarChart('statistics/requestslastmonth', 'barchart', 'Anfragen des letzten Monats', JSON.parse(event.data));
-            });
-
-            eventSource.addEventListener('deleterequeststates', event => {
-                drawPieChart('statistics/requeststates?delete=true', 'piechartdel1', 'Statusverteilung aller Anfragen', JSON.parse(event.data));
-            });
-            eventSource.addEventListener('deleterequestpatientstates', event => {
-                drawPieChart('statistics/requestpatientstates?delete=true', 'piechartdel2', 'Statusverteilung nach Patient', JSON.parse(event.data));
-            });
-            eventSource.addEventListener('deleterequestslastmonth', event => {
-                drawBarChart('statistics/requestslastmonth?delete=true', 'barchartdel', 'Anfragen des letzten Monats', JSON.parse(event.data));
-            });
-        }
-    </script>
+    <script th:src="@{/main.js}"></script>
+    <script th:src="@{/charts.js}"></script>
 </body>
 </html>
 \ No newline at end of file