Merge pull request 'feature/db-check' (#21) from feature/db-check into development

Reviewed-on: #21

.gitea/workflows/development-build.yaml

@@ -10,11 +10,12 @@ env:
   DOCKER_IMAGE_NAME: 'watcher-server'
   REGISTRY_URL: 'git.triggermeelmo.com/watcher'
   DOCKER_PLATFORMS: 'linux/amd64,linux/arm64'
-  RUNNER_TOOL_CACHE: /toolcache # Runner Tool Cache
 
 jobs:
   build-and-test:
     runs-on: ubuntu-latest
+    env:
+      RUNNER_TOOL_CACHE: /toolcache # Runner Tool Cache
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -39,6 +40,8 @@ jobs:
 
   docker-build-and-push:
     runs-on: ubuntu-latest
+    env:
+      RUNNER_TOOL_CACHE: /toolcache # Runner Tool Cache
     needs: build-and-test
     steps:
       - name: Checkout code

Watcher/Controllers/HomeController.cs

@@ -41,7 +41,6 @@ namespace Watcher.Controllers
                 .Where(u => u.Username == preferredUserName)
                 .FirstOrDefaultAsync();
 
-            Console.WriteLine("Index" + _DashboardStore.NetworkStatus);
             var viewModel = new DashboardViewModel
             {
                 ActiveServers = await _context.Servers.CountAsync(s => s.IsOnline),
@@ -75,8 +74,6 @@ namespace Watcher.Controllers
 
             var now = DateTime.UtcNow;
 
-            Console.WriteLine("DashboardStats" + _DashboardStore.NetworkStatus);
-
             var model = new DashboardViewModel
             {
                 ActiveServers = await _context.Servers.CountAsync(s => s.IsOnline),

Watcher/Views/Home/_DashboardStats.cshtml

@@ -83,17 +83,17 @@
 
                     @if (!Model.DatabaseStatus.IsNullOrEmpty())
                     {
-                        @if (Model.DatabaseStatus == "$ok")
+                        @if (Model.DatabaseStatus == "ok")
                         {
                             <div class="d-flex justify-content-between align-items-center mb-2">
                                 <span>Datenbank</span>
-                                <span class="badge bg-success">OK</span>
+                                <span class="badge bg-success">healthy</span>
                             </div>
                         } else
                         {
                             <div class="d-flex justify-content-between align-items-center mb-2">
                                 <span>Datenbank</span>
-                                <span class="badge bg-danger">Big Problem</span>
+                                <span class="badge bg-danger">unhealthy</span>
                             </div>
                         }
                     } else
@@ -134,6 +134,7 @@
         </div>
 
         <!-- Services -->
+        <!-- TODO
         <div class="col-12 col-lg-6">
             <div class="card shadow rounded-3 p-4 h-100">
                 <h2 class="h5 fw-semibold mb-3">Services</h2>
@@ -150,18 +151,20 @@
                 </ul>
             </div>
         </div>
+        -->
 
         <!-- Server Liste -->
+        <!-- TODO
         <div class="col-12 col-lg-6">
             <div class="card shadow rounded-3 p-4 h-100">
                 <h2 class="h5 fw-semibold mb-3">Server</h2>
                 <ul class="list-group list-group-flush">
-                    @foreach (var server in Model.Servers)
+                    @foreach (Server server in Model.Servers)
                     {
                         <li class="list-group-item d-flex justify-content-between align-items-center serverlist">
                             <span>@server.Name</span>
                             <span class="badge bg-info" )">
-                                CPU: 30.45%
+                                CPU: 
                             </span>
                             <span class="badge bg-info" )">
                                 RAM: 65.09%
@@ -173,6 +176,7 @@
                     }
                 </ul>
             </div>
+            -->
         </div>