From 7def038cc9e37fdcefbbd143c1f344709787ba44 Mon Sep 17 00:00:00 2001 From: daniel-hbn Date: Fri, 12 Sep 2025 11:50:04 +0200 Subject: [PATCH] stuff --- Watcher/Controllers/ApiController.cs | 32 ++++ Watcher/Controllers/DatabaseController.cs | 2 +- Watcher/Controllers/SystemController.cs | 36 +++++ Watcher/Controllers/UserController.cs | 26 +-- Watcher/Views/API/ApiReference.cshtml | 1 + Watcher/Views/Auth/Login.cshtml | 53 +----- Watcher/Views/Database/ManageSqlDumps.cshtml | 7 +- Watcher/Views/Home/_DashboardStats.cshtml | 3 - Watcher/Views/Server/Details.cshtml | 153 ++++++++---------- Watcher/Views/Server/EditServer.cshtml | 15 +- Watcher/Views/Shared/_Layout.cshtml | 2 +- Watcher/Views/Shared/_LoginLayout.cshtml | 4 +- .../Settings.cshtml} | 38 +---- Watcher/Views/User/Info.cshtml | 23 +++ Watcher/wwwroot/css/Login.css | 24 +++ Watcher/wwwroot/css/databases.css | 13 ++ Watcher/wwwroot/css/main.css | 25 +-- Watcher/wwwroot/css/server-detail.css | 20 +++ Watcher/wwwroot/css/server-edit.css | 0 .../css/{user-settings.css => settings.css} | 0 Watcher/wwwroot/css/user-info.css | 24 +++ 21 files changed, 285 insertions(+), 216 deletions(-) create mode 100644 Watcher/Controllers/ApiController.cs create mode 100644 Watcher/Controllers/SystemController.cs create mode 100644 Watcher/Views/API/ApiReference.cshtml rename Watcher/Views/{User/UserSettings.cshtml => System/Settings.cshtml} (72%) create mode 100644 Watcher/wwwroot/css/Login.css create mode 100644 Watcher/wwwroot/css/databases.css create mode 100644 Watcher/wwwroot/css/server-detail.css create mode 100644 Watcher/wwwroot/css/server-edit.css rename Watcher/wwwroot/css/{user-settings.css => settings.css} (100%) diff --git a/Watcher/Controllers/ApiController.cs b/Watcher/Controllers/ApiController.cs new file mode 100644 index 0000000..56385a8 --- /dev/null +++ b/Watcher/Controllers/ApiController.cs @@ -0,0 +1,32 @@ +using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; +using Watcher.Data; + +[Route("[controller]/v1")] +public class ApiController : Controller +{ + private readonly AppDbContext _context; + private readonly ILogger _logger; + + + public ApiController(AppDbContext context, ILogger logger) + { + _context = context; + _logger = logger; + } + + [HttpGet("reference")] + public IActionResult ApiReference() + { + return View(); + } + + [HttpGet("servers")] + public async Task GetAllServers() + { + var Servers = await _context.Servers.OrderBy(s => s.Id).ToListAsync(); + return Ok(); + } +} \ No newline at end of file diff --git a/Watcher/Controllers/DatabaseController.cs b/Watcher/Controllers/DatabaseController.cs index d6cb17f..856edf4 100644 --- a/Watcher/Controllers/DatabaseController.cs +++ b/Watcher/Controllers/DatabaseController.cs @@ -116,7 +116,7 @@ namespace Watcher.Controllers TempData["DumpMessage"] = "SQLite-Dump erfolgreich erstellt."; _logger.LogInformation("SQLite-Dump erfolgreich erstellt."); - return RedirectToAction("UserSettings", "User"); + return RedirectToAction("Settings", "System"); } catch (Exception ex) { diff --git a/Watcher/Controllers/SystemController.cs b/Watcher/Controllers/SystemController.cs new file mode 100644 index 0000000..e39ff2c --- /dev/null +++ b/Watcher/Controllers/SystemController.cs @@ -0,0 +1,36 @@ +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using Watcher.Data; +using Watcher.ViewModels; + +namespace Watcher.Controllers; + +[Authorize] +[Route("[controller]")] +public class SystemController : Controller +{ + private readonly AppDbContext _context; + private readonly ILogger _logger; + + public SystemController(AppDbContext context, ILogger logger) + { + _context = context; + _logger = logger; + } + + // Edit-Form anzeigen + [HttpGet("Settings")] + //public async Task Settings() + public IActionResult Settings() + { + ViewBag.DbProvider = "Microsoft.EntityFrameworkCore.Sqlite"; + ViewBag.mail = "test@mail.com"; + ViewBag.IdentityProvider = "Local"; + ViewBag.ServerVersion = "v0.1.0"; + return View(); + } + + // HttpPost + // public IActionResult UpdateNotifications(){} + +} diff --git a/Watcher/Controllers/UserController.cs b/Watcher/Controllers/UserController.cs index a9700c7..b227618 100644 --- a/Watcher/Controllers/UserController.cs +++ b/Watcher/Controllers/UserController.cs @@ -55,6 +55,7 @@ public class UserController : Controller var user = _context.Users.FirstOrDefault(u => u.Username == username); if (user == null) return NotFound(); + var model = new EditUserViewModel { Username = user.Username @@ -90,31 +91,6 @@ public class UserController : Controller return RedirectToAction("Index", "Home"); } - - // Edit-Form anzeigen - [Authorize] - [HttpGet] - public IActionResult UserSettings() - { - var username = User.Identity?.Name; - Console.WriteLine("gefundener User: " + username); - var claims = User.Claims.Select(c => new { c.Type, c.Value }).ToList(); - - var user = _context.Users.FirstOrDefault(u => u.Username == username); - if (user == null) return NotFound(); - - var DbProvider = _context.Database.ProviderName; - var mail = user.Email; - - ViewBag.Name = username; - ViewBag.mail = mail; - ViewBag.Claims = claims; - ViewBag.IdentityProvider = user.IdentityProvider; - ViewBag.DbProvider = DbProvider; - - return View(); - } - // Edit speichern [Authorize] [HttpPost] diff --git a/Watcher/Views/API/ApiReference.cshtml b/Watcher/Views/API/ApiReference.cshtml new file mode 100644 index 0000000..11a76d5 --- /dev/null +++ b/Watcher/Views/API/ApiReference.cshtml @@ -0,0 +1 @@ +

i

\ No newline at end of file diff --git a/Watcher/Views/Auth/Login.cshtml b/Watcher/Views/Auth/Login.cshtml index 49408c0..a4a822a 100644 --- a/Watcher/Views/Auth/Login.cshtml +++ b/Watcher/Views/Auth/Login.cshtml @@ -5,55 +5,10 @@ var oidc = ViewBag.oidc; } - + + + +