diff --git a/Components/Layout/ReconnectModal.razor b/Components/Layout/ReconnectModal.razor deleted file mode 100644 index e740b0c..0000000 --- a/Components/Layout/ReconnectModal.razor +++ /dev/null @@ -1,31 +0,0 @@ - - - -
- -

- Rejoining the server... -

-

- Rejoin failed... trying again in seconds. -

-

- Failed to rejoin.
Please retry or reload the page. -

- -

- The session has been paused by the server. -

-

- Failed to resume the session.
Please retry or reload the page. -

- -
- diff --git a/Components/Layout/ReconnectModal.razor.css b/Components/Layout/ReconnectModal.razor.css deleted file mode 100644 index 3ad3773..0000000 --- a/Components/Layout/ReconnectModal.razor.css +++ /dev/null @@ -1,157 +0,0 @@ -.components-reconnect-first-attempt-visible, -.components-reconnect-repeated-attempt-visible, -.components-reconnect-failed-visible, -.components-pause-visible, -.components-resume-failed-visible, -.components-rejoining-animation { - display: none; -} - -#components-reconnect-modal.components-reconnect-show .components-reconnect-first-attempt-visible, -#components-reconnect-modal.components-reconnect-show .components-rejoining-animation, -#components-reconnect-modal.components-reconnect-paused .components-pause-visible, -#components-reconnect-modal.components-reconnect-resume-failed .components-resume-failed-visible, -#components-reconnect-modal.components-reconnect-retrying, -#components-reconnect-modal.components-reconnect-retrying .components-reconnect-repeated-attempt-visible, -#components-reconnect-modal.components-reconnect-retrying .components-rejoining-animation, -#components-reconnect-modal.components-reconnect-failed, -#components-reconnect-modal.components-reconnect-failed .components-reconnect-failed-visible { - display: block; -} - - -#components-reconnect-modal { - background-color: white; - width: 20rem; - margin: 20vh auto; - padding: 2rem; - border: 0; - border-radius: 0.5rem; - box-shadow: 0 3px 6px 2px rgba(0, 0, 0, 0.3); - opacity: 0; - transition: display 0.5s allow-discrete, overlay 0.5s allow-discrete; - animation: components-reconnect-modal-fadeOutOpacity 0.5s both; - &[open] - -{ - animation: components-reconnect-modal-slideUp 1.5s cubic-bezier(.05, .89, .25, 1.02) 0.3s, components-reconnect-modal-fadeInOpacity 0.5s ease-in-out 0.3s; - animation-fill-mode: both; -} - -} - -#components-reconnect-modal::backdrop { - background-color: rgba(0, 0, 0, 0.4); - animation: components-reconnect-modal-fadeInOpacity 0.5s ease-in-out; - opacity: 1; -} - -@keyframes components-reconnect-modal-slideUp { - 0% { - transform: translateY(30px) scale(0.95); - } - - 100% { - transform: translateY(0); - } -} - -@keyframes components-reconnect-modal-fadeInOpacity { - 0% { - opacity: 0; - } - - 100% { - opacity: 1; - } -} - -@keyframes components-reconnect-modal-fadeOutOpacity { - 0% { - opacity: 1; - } - - 100% { - opacity: 0; - } -} - -.components-reconnect-container { - display: flex; - flex-direction: column; - align-items: center; - gap: 1rem; -} - -#components-reconnect-modal p { - margin: 0; - text-align: center; -} - -#components-reconnect-modal button { - border: 0; - background-color: #6b9ed2; - color: white; - padding: 4px 24px; - border-radius: 4px; -} - - #components-reconnect-modal button:hover { - background-color: #3b6ea2; - } - - #components-reconnect-modal button:active { - background-color: #6b9ed2; - } - -.components-rejoining-animation { - position: relative; - width: 80px; - height: 80px; -} - - .components-rejoining-animation div { - position: absolute; - border: 3px solid #0087ff; - opacity: 1; - border-radius: 50%; - animation: components-rejoining-animation 1.5s cubic-bezier(0, 0.2, 0.8, 1) infinite; - } - - .components-rejoining-animation div:nth-child(2) { - animation-delay: -0.5s; - } - -@keyframes components-rejoining-animation { - 0% { - top: 40px; - left: 40px; - width: 0; - height: 0; - opacity: 0; - } - - 4.9% { - top: 40px; - left: 40px; - width: 0; - height: 0; - opacity: 0; - } - - 5% { - top: 40px; - left: 40px; - width: 0; - height: 0; - opacity: 1; - } - - 100% { - top: 0px; - left: 0px; - width: 80px; - height: 80px; - opacity: 0; - } -} diff --git a/Components/Layout/ReconnectModal.razor.js b/Components/Layout/ReconnectModal.razor.js deleted file mode 100644 index a44de78..0000000 --- a/Components/Layout/ReconnectModal.razor.js +++ /dev/null @@ -1,63 +0,0 @@ -// Set up event handlers -const reconnectModal = document.getElementById("components-reconnect-modal"); -reconnectModal.addEventListener("components-reconnect-state-changed", handleReconnectStateChanged); - -const retryButton = document.getElementById("components-reconnect-button"); -retryButton.addEventListener("click", retry); - -const resumeButton = document.getElementById("components-resume-button"); -resumeButton.addEventListener("click", resume); - -function handleReconnectStateChanged(event) { - if (event.detail.state === "show") { - reconnectModal.showModal(); - } else if (event.detail.state === "hide") { - reconnectModal.close(); - } else if (event.detail.state === "failed") { - document.addEventListener("visibilitychange", retryWhenDocumentBecomesVisible); - } else if (event.detail.state === "rejected") { - location.reload(); - } -} - -async function retry() { - document.removeEventListener("visibilitychange", retryWhenDocumentBecomesVisible); - - try { - // Reconnect will asynchronously return: - // - true to mean success - // - false to mean we reached the server, but it rejected the connection (e.g., unknown circuit ID) - // - exception to mean we didn't reach the server (this can be sync or async) - const successful = await Blazor.reconnect(); - if (!successful) { - // We have been able to reach the server, but the circuit is no longer available. - // We'll reload the page so the user can continue using the app as quickly as possible. - const resumeSuccessful = await Blazor.resumeCircuit(); - if (!resumeSuccessful) { - location.reload(); - } else { - reconnectModal.close(); - } - } - } catch (err) { - // We got an exception, server is currently unavailable - document.addEventListener("visibilitychange", retryWhenDocumentBecomesVisible); - } -} - -async function resume() { - try { - const successful = await Blazor.resumeCircuit(); - if (!successful) { - location.reload(); - } - } catch { - reconnectModal.classList.replace("components-reconnect-paused", "components-reconnect-resume-failed"); - } -} - -async function retryWhenDocumentBecomesVisible() { - if (document.visibilityState === "visible") { - await retry(); - } -} diff --git a/Data/UserNotificationService.cs b/Data/UserNotificationService.cs deleted file mode 100644 index 683222d..0000000 --- a/Data/UserNotificationService.cs +++ /dev/null @@ -1,19 +0,0 @@ -namespace timetracker.Data; - -public class UserNotificationService -{ - public event Func? OnUsersChanged; - public event Func? OnUserDeleted; - - public async Task NotifyUsersChangedAsync() - { - if (OnUsersChanged != null) - await OnUsersChanged.Invoke(); - } - - public async Task NotifyUserDeletedAsync(int userId) - { - if (OnUserDeleted != null) - await OnUserDeleted.Invoke(userId); - } -} diff --git a/Program.cs b/Program.cs deleted file mode 100644 index 41fe168..0000000 --- a/Program.cs +++ /dev/null @@ -1,132 +0,0 @@ -using System.Security.Claims; -using Microsoft.AspNetCore.Authentication; -using Microsoft.AspNetCore.Authentication.Cookies; -using Microsoft.AspNetCore.HttpOverrides; -using Microsoft.EntityFrameworkCore; -using MudBlazor.Services; -using timetracker.Components; -using timetracker.Data; - -var builder = WebApplication.CreateBuilder(args); - -builder.Services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme) - .AddCookie(options => - { - options.LoginPath = "/login"; - options.LogoutPath = "/auth/logout"; - options.ExpireTimeSpan = TimeSpan.FromDays(30); - options.SlidingExpiration = true; - }); -builder.Services.AddAuthorization(options => -{ - options.AddPolicy("AdminOnly", policy => - policy.RequireClaim(System.Security.Claims.ClaimTypes.Name, "marc")); -}); -builder.Services.AddCascadingAuthenticationState(); -builder.Services.AddHttpContextAccessor(); -builder.Services.AddSingleton(); -builder.Services.AddScoped(); - -// Add services to the container. -builder.Services.AddRazorComponents() - .AddInteractiveServerComponents(); -builder.Services.AddMudServices(); -builder.Services.AddHttpClient(); - -var dbPath = Environment.GetEnvironmentVariable("TIMETRACKER_DB_PATH") - ?? Path.Combine(builder.Environment.ContentRootPath, "timetracker.db"); -builder.Services.AddDbContextFactory(options => - options.UseSqlite($"Data Source={dbPath}")); -builder.Services.AddScoped(); - -var app = builder.Build(); - -using (var scope = app.Services.CreateScope()) -{ - var factory = scope.ServiceProvider.GetRequiredService>(); - await using var db = await factory.CreateDbContextAsync(); - await db.Database.MigrateAsync(); -} - -var forwardedHeadersOptions = new ForwardedHeadersOptions -{ - ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto -}; -forwardedHeadersOptions.KnownProxies.Clear(); -forwardedHeadersOptions.KnownIPNetworks.Clear(); -app.UseForwardedHeaders(forwardedHeadersOptions); - -// Configure the HTTP request pipeline. -if (!app.Environment.IsDevelopment()) -{ - app.UseExceptionHandler("/Error", createScopeForErrors: true); - // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts. - app.UseHsts(); -} -app.UseStatusCodePagesWithReExecute("/not-found", createScopeForStatusCodePages: true); -if (app.Configuration.GetValue("EnableHttpsRedirect", !app.Environment.IsDevelopment())) -{ - app.UseHttpsRedirection(); -} - -// Statische Dateien (inkl. _framework/, _content/) vor Auth bedienen, -// damit Blazor-JS und MudBlazor-CSS nie durch Auth-Middleware geblockt werden -app.UseStaticFiles(); - -app.UseAuthentication(); -app.UseAuthorization(); - -app.UseAntiforgery(); - -app.MapStaticAssets(); -app.MapRazorComponents() - .AddInteractiveServerRenderMode(); - -// ── Auth-Endpoints ──────────────────────────────────────────────────────────── -app.MapPost("/auth/login", async (HttpContext ctx, AuthService authService) => -{ - var form = await ctx.Request.ReadFormAsync(); - var username = form["username"].ToString(); - var password = form["password"].ToString(); - var user = await authService.LoginAsync(username, password); - if (user == null) - return Results.Redirect("/login?error=invalid"); - - var claims = new[] { - new Claim(ClaimTypes.NameIdentifier, user.Id.ToString()), - new Claim(ClaimTypes.Name, user.Username) - }; - var identity = new ClaimsIdentity(claims, CookieAuthenticationDefaults.AuthenticationScheme); - await ctx.SignInAsync(CookieAuthenticationDefaults.AuthenticationScheme, - new ClaimsPrincipal(identity), - new AuthenticationProperties { IsPersistent = true }); - return Results.Redirect("/"); -}).DisableAntiforgery(); - -app.MapPost("/auth/register", async (HttpContext ctx, AuthService authService) => -{ - var form = await ctx.Request.ReadFormAsync(); - var username = form["username"].ToString(); - var password = form["password"].ToString(); - var (user, error) = await authService.RegisterAsync(username, password); - if (user == null) - return Results.Redirect($"/login?tab=register&error={Uri.EscapeDataString(error!)}"); - - var claims = new[] { - new Claim(ClaimTypes.NameIdentifier, user.Id.ToString()), - new Claim(ClaimTypes.Name, user.Username) - }; - var identity = new ClaimsIdentity(claims, CookieAuthenticationDefaults.AuthenticationScheme); - await ctx.SignInAsync(CookieAuthenticationDefaults.AuthenticationScheme, - new ClaimsPrincipal(identity), - new AuthenticationProperties { IsPersistent = true }); - return Results.Redirect("/"); -}).DisableAntiforgery(); - -app.MapGet("/auth/logout", async (HttpContext ctx) => -{ - await ctx.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme); - return Results.Redirect("/login"); -}); - -app.Run(); diff --git a/docker-compose.yml b/docker-compose.yml index c998785..35c62fd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,22 +1,36 @@ version: '3.8' services: + db: + image: postgres:16-alpine + container_name: timetracker-db + restart: always + environment: + POSTGRES_USER: timetracker_user + POSTGRES_PASSWORD: SecretPassword123 + POSTGRES_DB: timetracker + volumes: + - pgdata:/var/lib/postgresql/data + ports: + - "5432:5432" + timetracker: build: context: . - dockerfile: Dockerfile + dockerfile: timetracker.Server/Dockerfile container_name: timetracker-app restart: always ports: - "8090:8080" environment: - ASPNETCORE_ENVIRONMENT=Production - - ASPNETCORE_HTTP_PORTS=8080 # Lassen wir so, da intern völlig okay - - TIMETRACKER_DB_PATH=/data/timetracker.db + - ASPNETCORE_HTTP_PORTS=8080 + - DB_PROVIDER=PostgreSQL + - ConnectionStrings__DefaultConnection=Host=db;Database=timetracker;Username=timetracker_user;Password=SecretPassword123; - EnableHttpsRedirect=false - volumes: - - timetracker_data:/data + depends_on: + - db volumes: - timetracker_data: - name: timetracker_prod_data \ No newline at end of file + pgdata: + name: timetracker_pgdata \ No newline at end of file diff --git a/run-local.sh b/run-local.sh new file mode 100755 index 0000000..e41d113 --- /dev/null +++ b/run-local.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +# Exit on error +set -e + +echo "=== 1. Bereinige alte Build-Dateien ===" +dotnet clean + +echo "=== 2. Baue die gesamte Solution ===" +dotnet build + +echo "=== 3. Starte den Server & öffne Browser ===" +# Browser parallel nach kurzem Delay öffnen +(sleep 3 && open http://localhost:5065) & + +dotnet run --project timetracker.Server/timetracker.Server.csproj diff --git a/Components/Layout/MainLayout.razor b/timetracker.Client/Components/Layout/MainLayout.razor similarity index 95% rename from Components/Layout/MainLayout.razor rename to timetracker.Client/Components/Layout/MainLayout.razor index e08a347..e2caf38 100644 --- a/Components/Layout/MainLayout.razor +++ b/timetracker.Client/Components/Layout/MainLayout.razor @@ -1,7 +1,7 @@ -@inherits LayoutComponentBase +@inherits LayoutComponentBase @inject AuthenticationStateProvider AuthStateProvider @inject NavigationManager Nav -@inject timetracker.Data.UserNotificationService UserNotificationService +@inject IUserNotificationService UserNotificationService @implements IDisposable @using System.Security.Claims diff --git a/Components/Layout/MainLayout.razor.css b/timetracker.Client/Components/Layout/MainLayout.razor.css similarity index 100% rename from Components/Layout/MainLayout.razor.css rename to timetracker.Client/Components/Layout/MainLayout.razor.css diff --git a/Components/Layout/NavMenu.razor b/timetracker.Client/Components/Layout/NavMenu.razor similarity index 98% rename from Components/Layout/NavMenu.razor rename to timetracker.Client/Components/Layout/NavMenu.razor index f10b3dd..37c9aca 100644 --- a/Components/Layout/NavMenu.razor +++ b/timetracker.Client/Components/Layout/NavMenu.razor @@ -29,7 +29,7 @@ - Version 1.1 + Version 1.2 diff --git a/Components/Layout/NavMenu.razor.css b/timetracker.Client/Components/Layout/NavMenu.razor.css similarity index 100% rename from Components/Layout/NavMenu.razor.css rename to timetracker.Client/Components/Layout/NavMenu.razor.css diff --git a/Components/Pages/AdminUsers.razor b/timetracker.Client/Components/Pages/AdminUsers.razor similarity index 98% rename from Components/Pages/AdminUsers.razor rename to timetracker.Client/Components/Pages/AdminUsers.razor index cef5c86..5039fbc 100644 --- a/Components/Pages/AdminUsers.razor +++ b/timetracker.Client/Components/Pages/AdminUsers.razor @@ -1,10 +1,10 @@ @page "/admin/users" -@rendermode InteractiveServer +@rendermode InteractiveWebAssembly @attribute [Authorize(Policy = "AdminOnly")] -@inject AuthService AuthService +@inject IAuthService AuthService @inject ISnackbar Snackbar @inject AuthenticationStateProvider AuthStateProvider -@inject timetracker.Data.UserNotificationService UserNotificationService +@inject IUserNotificationService UserNotificationService @implements IDisposable Benutzerverwaltung – Timetracker diff --git a/Components/Pages/Changelog.razor b/timetracker.Client/Components/Pages/Changelog.razor similarity index 83% rename from Components/Pages/Changelog.razor rename to timetracker.Client/Components/Pages/Changelog.razor index d806a7e..afe9fc6 100644 --- a/Components/Pages/Changelog.razor +++ b/timetracker.Client/Components/Pages/Changelog.razor @@ -1,5 +1,5 @@ @page "/changelog" -@rendermode InteractiveServer +@rendermode InteractiveWebAssembly @attribute [Authorize] Changelog – Timetracker @@ -68,7 +68,15 @@ private readonly List _releases = [ - new("1.1", "08.06.2026", true, + new("1.2", "08.06.2026", true, + [ + new("Upgrade", "Architektur-Migration auf Hosted Blazor WebAssembly (.NET 10) mit sauberer Projektstruktur (Client, Server, Shared)"), + new("Neu", "Unterstützung für PostgreSQL-Datenbanken als produktive und skalierbare Alternative zu SQLite"), + new("Neu", "Dynamische DB-Provider-Weiche (SQLite vs. PostgreSQL) über Konfigurations- und Umgebungsvariablen"), + new("Neu", "Docker-Compose-Konfiguration inklusive PostgreSQL-Container für vereinfachten Deployment-Betrieb"), + new("Neu", "Lokales Ausführungsskript (run-local.sh) für einfaches Testen auf dem Entwicklungsrechner"), + ]), + new("1.1", "08.06.2026", false, [ new("Neu", "Versionsnummer in der Navbar mit Link zum Changelog"), new("Neu", "Changelog-Seite"), diff --git a/Components/Pages/Feiertage.razor b/timetracker.Client/Components/Pages/Feiertage.razor similarity index 99% rename from Components/Pages/Feiertage.razor rename to timetracker.Client/Components/Pages/Feiertage.razor index bd061c0..7e2debc 100644 --- a/Components/Pages/Feiertage.razor +++ b/timetracker.Client/Components/Pages/Feiertage.razor @@ -1,8 +1,8 @@ @page "/feiertage" -@rendermode InteractiveServer +@rendermode InteractiveWebAssembly @attribute [Authorize] -@inject HolidayService HolidayService -@inject TimetrackerService TrackerService +@inject IHolidayService HolidayService +@inject ITimetrackerService TrackerService @inject AuthenticationStateProvider AuthStateProvider Feiertage – Timetracker diff --git a/Components/Pages/Home.razor b/timetracker.Client/Components/Pages/Home.razor similarity index 99% rename from Components/Pages/Home.razor rename to timetracker.Client/Components/Pages/Home.razor index 72bd5cc..b7da6e6 100644 --- a/Components/Pages/Home.razor +++ b/timetracker.Client/Components/Pages/Home.razor @@ -1,8 +1,8 @@ @page "/" -@rendermode InteractiveServer +@rendermode InteractiveWebAssembly @attribute [Authorize] -@inject TimetrackerService TrackerService -@inject HolidayService HolidayService +@inject ITimetrackerService TrackerService +@inject IHolidayService HolidayService @inject ISnackbar Snackbar @inject AuthenticationStateProvider AuthStateProvider diff --git a/Components/Pages/Login.razor b/timetracker.Client/Components/Pages/Login.razor similarity index 64% rename from Components/Pages/Login.razor rename to timetracker.Client/Components/Pages/Login.razor index d0783e8..c7ff18f 100644 --- a/Components/Pages/Login.razor +++ b/timetracker.Client/Components/Pages/Login.razor @@ -1,5 +1,7 @@ @page "/login" +@rendermode InteractiveWebAssembly @attribute [AllowAnonymous] +@inject IAuthService AuthService @inject NavigationManager Nav Anmelden – Timetracker @@ -15,15 +17,15 @@ - @* ── Static Tab Navigation ── *@ + @* ── Tab Navigation ── *@ - Anmelden - @@ -41,14 +43,14 @@ { @_error } -
+ + Class="mt-2" + Disabled="_loading"> + @if (_loading) + { + + } Anmelden - +
} else @@ -80,14 +87,14 @@ { @_error } -
+ + Class="mt-2" + Disabled="_loading"> + @if (_loading) + { + + } Konto erstellen - +
} @@ -119,6 +131,10 @@ @code { private int _activeTab = 0; private string? _error; + private bool _loading; + + private readonly AuthModel _loginModel = new(); + private readonly AuthModel _registerModel = new(); [SupplyParameterFromQuery(Name = "error")] public string? ErrorParam { get; set; } @@ -136,5 +152,68 @@ }; _activeTab = TabParam == "register" ? 1 : 0; } -} + private void SetTab(int tab) + { + _activeTab = tab; + _error = null; + } + + private async Task HandleLogin() + { + _loading = true; + _error = null; + try + { + var user = await AuthService.LoginAsync(_loginModel.Username, _loginModel.Password); + if (user != null) + { + Nav.NavigateTo("/", forceLoad: true); // forceLoad forces state update/re-render of the root app + } + else + { + _error = "Benutzername oder Passwort falsch."; + } + } + catch (Exception ex) + { + _error = $"Login Fehler: {ex.Message}"; + } + finally + { + _loading = false; + } + } + + private async Task HandleRegister() + { + _loading = true; + _error = null; + try + { + var (user, error) = await AuthService.RegisterAsync(_registerModel.Username, _registerModel.Password); + if (user != null) + { + Nav.NavigateTo("/", forceLoad: true); + } + else + { + _error = error ?? "Registrierung fehlgeschlagen."; + } + } + catch (Exception ex) + { + _error = $"Registrierungs Fehler: {ex.Message}"; + } + finally + { + _loading = false; + } + } + + private class AuthModel + { + public string Username { get; set; } = ""; + public string Password { get; set; } = ""; + } +} diff --git a/Components/Pages/Month.razor b/timetracker.Client/Components/Pages/Month.razor similarity index 99% rename from Components/Pages/Month.razor rename to timetracker.Client/Components/Pages/Month.razor index 2f602c9..31c03e2 100644 --- a/Components/Pages/Month.razor +++ b/timetracker.Client/Components/Pages/Month.razor @@ -1,8 +1,8 @@ @page "/month" -@rendermode InteractiveServer +@rendermode InteractiveWebAssembly @attribute [Authorize] -@inject TimetrackerService TrackerService -@inject HolidayService HolidayService +@inject ITimetrackerService TrackerService +@inject IHolidayService HolidayService @inject AuthenticationStateProvider AuthStateProvider @_deCulture.DateTimeFormat.GetMonthName(_month) @_year – Monatsübersicht – Timetracker diff --git a/Components/Pages/NotFound.razor b/timetracker.Client/Components/Pages/NotFound.razor similarity index 100% rename from Components/Pages/NotFound.razor rename to timetracker.Client/Components/Pages/NotFound.razor diff --git a/Components/Pages/Settings.razor b/timetracker.Client/Components/Pages/Settings.razor similarity index 99% rename from Components/Pages/Settings.razor rename to timetracker.Client/Components/Pages/Settings.razor index 336cdee..117c489 100644 --- a/Components/Pages/Settings.razor +++ b/timetracker.Client/Components/Pages/Settings.razor @@ -1,8 +1,8 @@ @page "/settings" -@rendermode InteractiveServer +@rendermode InteractiveWebAssembly @attribute [Authorize] -@inject TimetrackerService TrackerService -@inject HolidayService HolidayService +@inject ITimetrackerService TrackerService +@inject IHolidayService HolidayService @inject ISnackbar Snackbar @inject AuthenticationStateProvider AuthStateProvider diff --git a/Components/Pages/UrlaubsMaximizer.razor b/timetracker.Client/Components/Pages/UrlaubsMaximizer.razor similarity index 99% rename from Components/Pages/UrlaubsMaximizer.razor rename to timetracker.Client/Components/Pages/UrlaubsMaximizer.razor index e0ef586..11e01ad 100644 --- a/Components/Pages/UrlaubsMaximizer.razor +++ b/timetracker.Client/Components/Pages/UrlaubsMaximizer.razor @@ -1,8 +1,8 @@ @page "/urlaub-maximizer" -@rendermode InteractiveServer +@rendermode InteractiveWebAssembly @attribute [Authorize] -@inject TimetrackerService TrackerService -@inject HolidayService HolidayService +@inject ITimetrackerService TrackerService +@inject IHolidayService HolidayService @inject ISnackbar Snackbar @inject AuthenticationStateProvider AuthStateProvider diff --git a/Components/RedirectToLogin.razor b/timetracker.Client/Components/RedirectToLogin.razor similarity index 100% rename from Components/RedirectToLogin.razor rename to timetracker.Client/Components/RedirectToLogin.razor diff --git a/Components/Routes.razor b/timetracker.Client/Components/Routes.razor similarity index 54% rename from Components/Routes.razor rename to timetracker.Client/Components/Routes.razor index ae21609..e8f40fd 100644 --- a/Components/Routes.razor +++ b/timetracker.Client/Components/Routes.razor @@ -1,10 +1,10 @@ -@rendermode InteractiveServer +@rendermode InteractiveWebAssembly - + - + - + diff --git a/timetracker.Client/Components/_Imports.razor b/timetracker.Client/Components/_Imports.razor new file mode 100644 index 0000000..903abf5 --- /dev/null +++ b/timetracker.Client/Components/_Imports.razor @@ -0,0 +1,17 @@ +@using System.Net.Http +@using System.Net.Http.Json +@using System.Security.Claims +@using Microsoft.AspNetCore.Authorization +@using Microsoft.AspNetCore.Components.Authorization +@using Microsoft.AspNetCore.Components.Forms +@using Microsoft.AspNetCore.Components.Routing +@using Microsoft.AspNetCore.Components.Web +@using static Microsoft.AspNetCore.Components.Web.RenderMode +@using Microsoft.AspNetCore.Components.Web.Virtualization +@using Microsoft.JSInterop +@using timetracker.Client +@using timetracker.Client.Components +@using timetracker.Client.Components.Layout +@using timetracker.Client.Services +@using timetracker.Shared +@using MudBlazor diff --git a/timetracker.Client/Program.cs b/timetracker.Client/Program.cs new file mode 100644 index 0000000..d36d72e --- /dev/null +++ b/timetracker.Client/Program.cs @@ -0,0 +1,27 @@ +using Microsoft.AspNetCore.Components.Authorization; +using Microsoft.AspNetCore.Components.WebAssembly.Hosting; +using MudBlazor.Services; +using timetracker.Client.Services; +using timetracker.Shared; + +var builder = WebAssemblyHostBuilder.CreateDefault(args); + +builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) }); + +builder.Services.AddMudServices(); + +builder.Services.AddAuthorizationCore(options => +{ + options.AddPolicy("AdminOnly", policy => + policy.RequireClaim(System.Security.Claims.ClaimTypes.Name, "marc")); +}); + +builder.Services.AddScoped(); +builder.Services.AddScoped(sp => sp.GetRequiredService()); + +builder.Services.AddScoped(); +builder.Services.AddScoped(); +builder.Services.AddScoped(); +builder.Services.AddScoped(); + +await builder.Build().RunAsync(); diff --git a/timetracker.Client/Properties/launchSettings.json b/timetracker.Client/Properties/launchSettings.json new file mode 100644 index 0000000..316e152 --- /dev/null +++ b/timetracker.Client/Properties/launchSettings.json @@ -0,0 +1,25 @@ +{ + "$schema": "https://json.schemastore.org/launchsettings.json", + "profiles": { + "http": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", + "applicationUrl": "http://localhost:5016", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "https": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", + "applicationUrl": "https://localhost:7270;http://localhost:5016", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } +} diff --git a/timetracker.Client/Services/ClientAuthService.cs b/timetracker.Client/Services/ClientAuthService.cs new file mode 100644 index 0000000..ceaade3 --- /dev/null +++ b/timetracker.Client/Services/ClientAuthService.cs @@ -0,0 +1,74 @@ +using System.Net.Http.Json; +using Microsoft.AspNetCore.Components.Authorization; +using timetracker.Shared; + +namespace timetracker.Client.Services; + +public class ClientAuthService : IAuthService +{ + private readonly HttpClient _http; + private readonly AuthenticationStateProvider _authStateProvider; + + public ClientAuthService(HttpClient http, AuthenticationStateProvider authStateProvider) + { + _http = http; + _authStateProvider = authStateProvider; + } + + private HostAuthenticationStateProvider HostProvider => (HostAuthenticationStateProvider)_authStateProvider; + + public async Task LoginAsync(string username, string password) + { + var response = await _http.PostAsJsonAsync("api/auth/login", new { Username = username, Password = password }); + if (response.IsSuccessStatusCode) + { + var userInfo = await response.Content.ReadFromJsonAsync(); + if (userInfo != null) + { + HostProvider.NotifyUserChanged(userInfo); + return new User { Id = userInfo.Id, Username = userInfo.Username }; + } + } + return null; + } + + public async Task<(User? User, string? Error)> RegisterAsync(string username, string password) + { + var response = await _http.PostAsJsonAsync("api/auth/register", new { Username = username, Password = password }); + if (response.IsSuccessStatusCode) + { + var userInfo = await response.Content.ReadFromJsonAsync(); + if (userInfo != null) + { + HostProvider.NotifyUserChanged(userInfo); + return (new User { Id = userInfo.Id, Username = userInfo.Username }, null); + } + } + else + { + var error = await response.Content.ReadAsStringAsync(); + return (null, error); + } + return (null, "Registrierung fehlgeschlagen."); + } + + public async Task> GetAllUsersAsync() + { + return await _http.GetFromJsonAsync>("api/users") ?? []; + } + + public async Task DeleteUserAsync(int userId) + { + await _http.DeleteAsync($"api/users/{userId}"); + } + + public async Task RenameUserAsync(int userId, string newUsername) + { + var response = await _http.PutAsJsonAsync($"api/users/{userId}/rename", new { Username = newUsername }); + if (!response.IsSuccessStatusCode) + { + return await response.Content.ReadAsStringAsync(); + } + return null; + } +} diff --git a/timetracker.Client/Services/ClientHolidayService.cs b/timetracker.Client/Services/ClientHolidayService.cs new file mode 100644 index 0000000..4acdaf0 --- /dev/null +++ b/timetracker.Client/Services/ClientHolidayService.cs @@ -0,0 +1,49 @@ +using System.Net.Http.Json; +using timetracker.Shared; + +namespace timetracker.Client.Services; + +public class ClientHolidayService : IHolidayService +{ + private readonly HttpClient _http; + + public ClientHolidayService(HttpClient http) + { + _http = http; + } + + public async Task> GetHolidaysAsync(int year, string? stateCode = null) + { + var url = $"api/holidays?year={year}"; + if (!string.IsNullOrEmpty(stateCode)) + { + url += $"&stateCode={stateCode}"; + } + return await _http.GetFromJsonAsync>(url) ?? []; + } + + public async Task<(bool Success, string Message)> FetchAndStoreAsync(int year) + { + var response = await _http.PostAsync($"api/holidays/fetch/{year}", null); + if (response.IsSuccessStatusCode) + { + var result = await response.Content.ReadFromJsonAsync(); + if (result != null) + { + return (result.Success, result.Message); + } + } + return (false, "Fehler beim Abrufen der Feiertage."); + } + + public async Task DeleteAsync(int id) + { + await _http.DeleteAsync($"api/holidays/{id}"); + } + + private class FetchResponse + { + public bool Success { get; set; } + public string Message { get; set; } = ""; + } +} diff --git a/timetracker.Client/Services/ClientTimetrackerService.cs b/timetracker.Client/Services/ClientTimetrackerService.cs new file mode 100644 index 0000000..cd35d5d --- /dev/null +++ b/timetracker.Client/Services/ClientTimetrackerService.cs @@ -0,0 +1,65 @@ +using System.Net.Http.Json; +using timetracker.Shared; + +namespace timetracker.Client.Services; + +public class ClientTimetrackerService : ITimetrackerService +{ + private readonly HttpClient _http; + + public ClientTimetrackerService(HttpClient http) + { + _http = http; + } + + public async Task> GetWeekAsync(int userId, DateOnly monday) + { + return await _http.GetFromJsonAsync>($"api/tracker/week?userId={userId}&monday={monday:yyyy-MM-dd}") ?? []; + } + + public async Task UpsertWorkDayAsync(WorkDay workDay) + { + await _http.PostAsJsonAsync("api/tracker/workday", workDay); + } + + public async Task GetSettingsAsync(int userId) + { + return await _http.GetFromJsonAsync($"api/tracker/settings/{userId}") ?? new AppSettings { UserId = userId }; + } + + public async Task SaveSettingsAsync(AppSettings settings) + { + await _http.PostAsJsonAsync("api/tracker/settings", settings); + } + + public async Task> GetVacationDaysAsync(int userId, int year) + { + return await _http.GetFromJsonAsync>($"api/tracker/vacation/{userId}/{year}") ?? []; + } + + public async Task AddVacationDayAsync(VacationDay vacationDay) + { + await _http.PostAsJsonAsync("api/tracker/vacation", vacationDay); + } + + public async Task RemoveVacationDayAsync(int userId, int id) + { + await _http.DeleteAsync($"api/tracker/vacation/{userId}/{id}"); + } + + public async Task GetTotalOvertimeAsync(int userId, AppSettings settings) + { + var response = await _http.PostAsJsonAsync($"api/tracker/overtime/{userId}", settings); + if (response.IsSuccessStatusCode) + { + var hours = await response.Content.ReadFromJsonAsync(); + return TimeSpan.FromHours(hours); + } + return TimeSpan.Zero; + } + + public async Task> GetMonthAsync(int userId, int year, int month) + { + return await _http.GetFromJsonAsync>($"api/tracker/month?userId={userId}&year={year}&month={month}") ?? []; + } +} diff --git a/timetracker.Client/Services/HostAuthenticationStateProvider.cs b/timetracker.Client/Services/HostAuthenticationStateProvider.cs new file mode 100644 index 0000000..655f30a --- /dev/null +++ b/timetracker.Client/Services/HostAuthenticationStateProvider.cs @@ -0,0 +1,73 @@ +using System.Security.Claims; +using System.Net.Http.Json; +using Microsoft.AspNetCore.Components.Authorization; +using timetracker.Shared; + +namespace timetracker.Client.Services; + +public class HostAuthenticationStateProvider : AuthenticationStateProvider +{ + private readonly HttpClient _http; + private static readonly ClaimsPrincipal Anonymous = new(new ClaimsIdentity()); + private ClaimsPrincipal? _currentUser; + + public HostAuthenticationStateProvider(HttpClient http) + { + _http = http; + } + + public override async Task GetAuthenticationStateAsync() + { + if (_currentUser != null) + { + return new AuthenticationState(_currentUser); + } + + try + { + var response = await _http.GetAsync("api/auth/me"); + if (response.IsSuccessStatusCode) + { + var userInfo = await response.Content.ReadFromJsonAsync(); + if (userInfo != null) + { + var claims = new[] + { + new Claim(ClaimTypes.NameIdentifier, userInfo.Id.ToString()), + new Claim(ClaimTypes.Name, userInfo.Username) + }; + var identity = new ClaimsIdentity(claims, "Cookie"); + _currentUser = new ClaimsPrincipal(identity); + return new AuthenticationState(_currentUser); + } + } + } + catch + { + // Ignore error and fall back to anonymous (e.g. server offline or network issues) + } + + _currentUser = Anonymous; + return new AuthenticationState(_currentUser); + } + + public void NotifyUserChanged(UserInfo? userInfo) + { + if (userInfo != null) + { + var claims = new[] + { + new Claim(ClaimTypes.NameIdentifier, userInfo.Id.ToString()), + new Claim(ClaimTypes.Name, userInfo.Username) + }; + var identity = new ClaimsIdentity(claims, "Cookie"); + _currentUser = new ClaimsPrincipal(identity); + } + else + { + _currentUser = Anonymous; + } + + NotifyAuthenticationStateChanged(Task.FromResult(new AuthenticationState(_currentUser))); + } +} diff --git a/timetracker.Client/Services/UserNotificationService.cs b/timetracker.Client/Services/UserNotificationService.cs new file mode 100644 index 0000000..69e088e --- /dev/null +++ b/timetracker.Client/Services/UserNotificationService.cs @@ -0,0 +1,56 @@ +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.SignalR.Client; +using timetracker.Shared; + +namespace timetracker.Client.Services; + +public class UserNotificationService : IUserNotificationService, IAsyncDisposable +{ + private readonly HubConnection _hubConnection; + + public event Func? OnUsersChanged; + public event Func? OnUserDeleted; + + public UserNotificationService(NavigationManager navigationManager) + { + _hubConnection = new HubConnectionBuilder() + .WithUrl(navigationManager.ToAbsoluteUri("/hubs/notifications")) + .WithAutomaticReconnect() + .Build(); + + _hubConnection.On("UsersChanged", async () => + { + if (OnUsersChanged != null) + await OnUsersChanged.Invoke(); + }); + + _hubConnection.On("UserDeleted", async (userId) => + { + if (OnUserDeleted != null) + await OnUserDeleted.Invoke(userId); + }); + + // Start connection asynchronously + _ = StartHubConnectionAsync(); + } + + private async Task StartHubConnectionAsync() + { + try + { + await _hubConnection.StartAsync(); + } + catch (Exception ex) + { + Console.WriteLine($"SignalR Connection Error: {ex.Message}"); + } + } + + public async ValueTask DisposeAsync() + { + if (_hubConnection != null) + { + await _hubConnection.DisposeAsync(); + } + } +} diff --git a/timetracker.Client/_Imports.razor b/timetracker.Client/_Imports.razor new file mode 100644 index 0000000..71848dc --- /dev/null +++ b/timetracker.Client/_Imports.razor @@ -0,0 +1,13 @@ +@using System.Net.Http +@using System.Net.Http.Json +@using Microsoft.AspNetCore.Components.Forms +@using Microsoft.AspNetCore.Components.Routing +@using Microsoft.AspNetCore.Components.Web +@using Microsoft.AspNetCore.Components.Web.Virtualization +@using Microsoft.AspNetCore.Components.WebAssembly.Http +@using Microsoft.JSInterop +@using timetracker.Client +@using timetracker.Client.Components +@using timetracker.Client.Components.Layout +@using timetracker.Shared +@using MudBlazor diff --git a/timetracker.Client/timetracker.Client.csproj b/timetracker.Client/timetracker.Client.csproj new file mode 100644 index 0000000..06712b5 --- /dev/null +++ b/timetracker.Client/timetracker.Client.csproj @@ -0,0 +1,22 @@ + + + + net10.0 + enable + enable + true + + + + + + + + + + + + + + + diff --git a/timetracker.Client/wwwroot/icon-192.png b/timetracker.Client/wwwroot/icon-192.png new file mode 100644 index 0000000..166f56d Binary files /dev/null and b/timetracker.Client/wwwroot/icon-192.png differ diff --git a/Components/App.razor b/timetracker.Server/Components/App.razor similarity index 95% rename from Components/App.razor rename to timetracker.Server/Components/App.razor index 990baf9..8d383fd 100644 --- a/Components/App.razor +++ b/timetracker.Server/Components/App.razor @@ -1,4 +1,4 @@ - + @@ -18,7 +18,6 @@ - diff --git a/Components/Pages/Error.razor b/timetracker.Server/Components/Pages/Error.razor similarity index 100% rename from Components/Pages/Error.razor rename to timetracker.Server/Components/Pages/Error.razor diff --git a/Components/_Imports.razor b/timetracker.Server/Components/_Imports.razor similarity index 79% rename from Components/_Imports.razor rename to timetracker.Server/Components/_Imports.razor index 622292a..1cc17b6 100644 --- a/Components/_Imports.razor +++ b/timetracker.Server/Components/_Imports.razor @@ -1,4 +1,4 @@ -@using System.Net.Http +@using System.Net.Http @using System.Net.Http.Json @using System.Security.Claims @using Microsoft.AspNetCore.Authorization @@ -10,7 +10,8 @@ @using Microsoft.AspNetCore.Components.Web.Virtualization @using Microsoft.JSInterop @using timetracker -@using timetracker.Components -@using timetracker.Components.Layout +@using timetracker.Client.Components +@using timetracker.Client.Components.Layout @using timetracker.Data +@using timetracker.Shared @using MudBlazor diff --git a/Data/AuthService.cs b/timetracker.Server/Data/AuthService.cs similarity index 97% rename from Data/AuthService.cs rename to timetracker.Server/Data/AuthService.cs index 7b91746..3f4e1a0 100644 --- a/Data/AuthService.cs +++ b/timetracker.Server/Data/AuthService.cs @@ -1,10 +1,11 @@ using System.Security.Cryptography; using System.Text; using Microsoft.EntityFrameworkCore; +using timetracker.Shared; namespace timetracker.Data; -public class AuthService(IDbContextFactory factory, UserNotificationService notifier) +public class AuthService(IDbContextFactory factory, UserNotificationService notifier) : IAuthService { public async Task LoginAsync(string username, string password) { diff --git a/Data/HolidayService.cs b/timetracker.Server/Data/HolidayService.cs similarity index 97% rename from Data/HolidayService.cs rename to timetracker.Server/Data/HolidayService.cs index 0f611e8..dbcbfa0 100644 --- a/Data/HolidayService.cs +++ b/timetracker.Server/Data/HolidayService.cs @@ -1,10 +1,11 @@ using Microsoft.EntityFrameworkCore; using System.Net.Http.Json; using System.Text.Json.Serialization; +using timetracker.Shared; namespace timetracker.Data; -public class HolidayService(IDbContextFactory factory, HttpClient http) +public class HolidayService(IDbContextFactory factory, HttpClient http) : IHolidayService { private const string ApiUrl = "https://date.nager.at/api/v3/PublicHolidays/{0}/DE"; diff --git a/Data/Migrations/20260520133634_Initial.Designer.cs b/timetracker.Server/Data/Migrations/20260520133634_Initial.Designer.cs similarity index 100% rename from Data/Migrations/20260520133634_Initial.Designer.cs rename to timetracker.Server/Data/Migrations/20260520133634_Initial.Designer.cs diff --git a/Data/Migrations/20260520133634_Initial.cs b/timetracker.Server/Data/Migrations/20260520133634_Initial.cs similarity index 100% rename from Data/Migrations/20260520133634_Initial.cs rename to timetracker.Server/Data/Migrations/20260520133634_Initial.cs diff --git a/Data/Migrations/20260520200000_AddPublicHolidays.Designer.cs b/timetracker.Server/Data/Migrations/20260520200000_AddPublicHolidays.Designer.cs similarity index 100% rename from Data/Migrations/20260520200000_AddPublicHolidays.Designer.cs rename to timetracker.Server/Data/Migrations/20260520200000_AddPublicHolidays.Designer.cs diff --git a/Data/Migrations/20260520200000_AddPublicHolidays.cs b/timetracker.Server/Data/Migrations/20260520200000_AddPublicHolidays.cs similarity index 100% rename from Data/Migrations/20260520200000_AddPublicHolidays.cs rename to timetracker.Server/Data/Migrations/20260520200000_AddPublicHolidays.cs diff --git a/Data/Migrations/20260522081459_AddMultiUser.Designer.cs b/timetracker.Server/Data/Migrations/20260522081459_AddMultiUser.Designer.cs similarity index 100% rename from Data/Migrations/20260522081459_AddMultiUser.Designer.cs rename to timetracker.Server/Data/Migrations/20260522081459_AddMultiUser.Designer.cs diff --git a/Data/Migrations/20260522081459_AddMultiUser.cs b/timetracker.Server/Data/Migrations/20260522081459_AddMultiUser.cs similarity index 100% rename from Data/Migrations/20260522081459_AddMultiUser.cs rename to timetracker.Server/Data/Migrations/20260522081459_AddMultiUser.cs diff --git a/Data/Migrations/20260607213215_AddFlexTimeAndHolidayState.Designer.cs b/timetracker.Server/Data/Migrations/20260607213215_AddFlexTimeAndHolidayState.Designer.cs similarity index 100% rename from Data/Migrations/20260607213215_AddFlexTimeAndHolidayState.Designer.cs rename to timetracker.Server/Data/Migrations/20260607213215_AddFlexTimeAndHolidayState.Designer.cs diff --git a/Data/Migrations/20260607213215_AddFlexTimeAndHolidayState.cs b/timetracker.Server/Data/Migrations/20260607213215_AddFlexTimeAndHolidayState.cs similarity index 100% rename from Data/Migrations/20260607213215_AddFlexTimeAndHolidayState.cs rename to timetracker.Server/Data/Migrations/20260607213215_AddFlexTimeAndHolidayState.cs diff --git a/Data/Migrations/TimetrackerDbContextModelSnapshot.cs b/timetracker.Server/Data/Migrations/TimetrackerDbContextModelSnapshot.cs similarity index 100% rename from Data/Migrations/TimetrackerDbContextModelSnapshot.cs rename to timetracker.Server/Data/Migrations/TimetrackerDbContextModelSnapshot.cs diff --git a/timetracker.Server/Data/NotificationHub.cs b/timetracker.Server/Data/NotificationHub.cs new file mode 100644 index 0000000..f2ab32c --- /dev/null +++ b/timetracker.Server/Data/NotificationHub.cs @@ -0,0 +1,7 @@ +using Microsoft.AspNetCore.SignalR; + +namespace timetracker.Data; + +public class NotificationHub : Hub +{ +} diff --git a/Data/TimetrackerDbContext.cs b/timetracker.Server/Data/TimetrackerDbContext.cs similarity index 95% rename from Data/TimetrackerDbContext.cs rename to timetracker.Server/Data/TimetrackerDbContext.cs index bb04343..1d23e64 100644 --- a/Data/TimetrackerDbContext.cs +++ b/timetracker.Server/Data/TimetrackerDbContext.cs @@ -1,4 +1,5 @@ using Microsoft.EntityFrameworkCore; +using timetracker.Shared; namespace timetracker.Data; diff --git a/Data/TimetrackerService.cs b/timetracker.Server/Data/TimetrackerService.cs similarity index 99% rename from Data/TimetrackerService.cs rename to timetracker.Server/Data/TimetrackerService.cs index c008d24..349e754 100644 --- a/Data/TimetrackerService.cs +++ b/timetracker.Server/Data/TimetrackerService.cs @@ -1,8 +1,9 @@ using Microsoft.EntityFrameworkCore; +using timetracker.Shared; namespace timetracker.Data; -public class TimetrackerService(IDbContextFactory factory) +public class TimetrackerService(IDbContextFactory factory) : ITimetrackerService { public async Task> GetWeekAsync(int userId, DateOnly monday) { diff --git a/timetracker.Server/Data/UserNotificationService.cs b/timetracker.Server/Data/UserNotificationService.cs new file mode 100644 index 0000000..579a083 --- /dev/null +++ b/timetracker.Server/Data/UserNotificationService.cs @@ -0,0 +1,37 @@ +using Microsoft.AspNetCore.SignalR; +using timetracker.Shared; + +namespace timetracker.Data; + +public class UserNotificationService : IUserNotificationService +{ + private readonly IHubContext _hubContext; + + public event Func? OnUsersChanged; + public event Func? OnUserDeleted; + + public UserNotificationService(IHubContext hubContext) + { + _hubContext = hubContext; + } + + public async Task NotifyUsersChangedAsync() + { + // Broadcast via SignalR to all clients + await _hubContext.Clients.All.SendAsync("UsersChanged"); + + // Also trigger locally if there are server-side subscribers + if (OnUsersChanged != null) + await OnUsersChanged.Invoke(); + } + + public async Task NotifyUserDeletedAsync(int userId) + { + // Broadcast via SignalR to all clients + await _hubContext.Clients.All.SendAsync("UserDeleted", userId); + + // Also trigger locally if there are server-side subscribers + if (OnUserDeleted != null) + await OnUserDeleted.Invoke(userId); + } +} diff --git a/Dockerfile b/timetracker.Server/Dockerfile similarity index 57% rename from Dockerfile rename to timetracker.Server/Dockerfile index b37c6df..a14dace 100644 --- a/Dockerfile +++ b/timetracker.Server/Dockerfile @@ -2,11 +2,22 @@ FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build WORKDIR /src -# Keine Unterordner mehr beim Kopieren! -COPY timetracker.csproj ./ -RUN dotnet restore timetracker.csproj +# Copy project files for restoring dependencies +COPY timetracker.sln ./ +COPY timetracker.Server/timetracker.Server.csproj timetracker.Server/ +COPY timetracker.Client/timetracker.Client.csproj timetracker.Client/ +COPY timetracker.Shared/timetracker.Shared.csproj timetracker.Shared/ -COPY . ./ +# Restore dependencies +RUN dotnet restore timetracker.sln + +# Copy the rest of the source code +COPY timetracker.Server/ timetracker.Server/ +COPY timetracker.Client/ timetracker.Client/ +COPY timetracker.Shared/ timetracker.Shared/ + +# Publish +WORKDIR /src/timetracker.Server RUN dotnet publish -c Release -o /app/publish # ── Runtime Stage ───────────────────────────────────────────────────────────── @@ -14,7 +25,7 @@ FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS final WORKDIR /app COPY --from=build /app/publish . -# Verzeichnis für die SQLite-Datenbank +# Directory for SQLite database RUN mkdir -p /data ENV ASPNETCORE_HTTP_PORTS=8080 @@ -27,4 +38,4 @@ EXPOSE 8080 VOLUME ["/data"] -ENTRYPOINT ["dotnet", "timetracker.dll"] \ No newline at end of file +ENTRYPOINT ["dotnet", "timetracker.Server.dll"] \ No newline at end of file diff --git a/timetracker.Server/Program.cs b/timetracker.Server/Program.cs new file mode 100644 index 0000000..3a83529 --- /dev/null +++ b/timetracker.Server/Program.cs @@ -0,0 +1,305 @@ +using System.Security.Claims; +using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Authentication.Cookies; +using Microsoft.AspNetCore.HttpOverrides; +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; +using MudBlazor.Services; +using timetracker.Server.Components; +using timetracker.Data; +using timetracker.Shared; + +var builder = WebApplication.CreateBuilder(args); + +// Add Authentication +builder.Services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme) + .AddCookie(options => + { + options.LoginPath = "/login"; + options.LogoutPath = "/auth/logout"; + options.ExpireTimeSpan = TimeSpan.FromDays(30); + options.SlidingExpiration = true; + // Cookie-Konfiguration für APIs & WASM + options.Events.OnRedirectToLogin = context => + { + if (context.Request.Path.StartsWithSegments("/api")) + { + context.Response.StatusCode = StatusCodes.Status401Unauthorized; + } + else + { + context.Response.Redirect(context.RedirectUri); + } + return Task.CompletedTask; + }; + }); + +builder.Services.AddAuthorization(options => +{ + options.AddPolicy("AdminOnly", policy => + policy.RequireClaim(ClaimTypes.Name, "marc")); +}); + +builder.Services.AddCascadingAuthenticationState(); +builder.Services.AddHttpContextAccessor(); + +// Add SignalR +builder.Services.AddSignalR(); +builder.Services.AddSingleton(); +builder.Services.AddSingleton(sp => sp.GetRequiredService()); + +// Register DB-backed services as the interfaces +builder.Services.AddScoped(); +builder.Services.AddScoped(); +builder.Services.AddScoped(); + +// Add services to the container. +builder.Services.AddRazorComponents() + .AddInteractiveWebAssemblyComponents(); + +builder.Services.AddMudServices(); +builder.Services.AddHttpClient(); + +var dbProvider = builder.Configuration["DB_PROVIDER"] ?? "SQLite"; + +if (dbProvider.Equals("PostgreSQL", StringComparison.OrdinalIgnoreCase)) +{ + var connectionString = builder.Configuration.GetConnectionString("DefaultConnection") + ?? builder.Configuration["ConnectionStrings:DefaultConnection"]; + builder.Services.AddDbContextFactory(options => + options.UseNpgsql(connectionString)); +} +else +{ + var dbPath = Environment.GetEnvironmentVariable("TIMETRACKER_DB_PATH") + ?? Path.Combine(builder.Environment.ContentRootPath, "timetracker.db"); + builder.Services.AddDbContextFactory(options => + options.UseSqlite($"Data Source={dbPath}")); +} + +var app = builder.Build(); + +// Migrate or Ensure Database Created +using (var scope = app.Services.CreateScope()) +{ + var factory = scope.ServiceProvider.GetRequiredService>(); + await using var db = await factory.CreateDbContextAsync(); + if (dbProvider.Equals("PostgreSQL", StringComparison.OrdinalIgnoreCase)) + { + await db.Database.EnsureCreatedAsync(); + } + else + { + await db.Database.MigrateAsync(); + } +} + +var forwardedHeadersOptions = new ForwardedHeadersOptions +{ + ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto +}; +forwardedHeadersOptions.KnownProxies.Clear(); +forwardedHeadersOptions.KnownIPNetworks.Clear(); +app.UseForwardedHeaders(forwardedHeadersOptions); + +// Configure the HTTP request pipeline. +if (app.Environment.IsDevelopment()) +{ + app.UseWebAssemblyDebugging(); +} +else +{ + app.UseExceptionHandler("/Error", createScopeForErrors: true); + app.UseHsts(); +} + +app.UseStatusCodePagesWithReExecute("/not-found", createScopeForStatusCodePages: true); +if (app.Configuration.GetValue("EnableHttpsRedirect", !app.Environment.IsDevelopment())) +{ + app.UseHttpsRedirection(); +} + +app.UseStaticFiles(); +app.UseAuthentication(); +app.UseAuthorization(); +app.UseAntiforgery(); + +app.MapStaticAssets(); + +// Map Hub +app.MapHub("/hubs/notifications"); + +// Map Blazor WASM +app.MapRazorComponents() + .AddInteractiveWebAssemblyRenderMode() + .AddAdditionalAssemblies(typeof(timetracker.Client._Imports).Assembly); + +// ── Auth-API-Endpoints ──────────────────────────────────────────────────────── +app.MapGet("/api/auth/me", (HttpContext ctx) => +{ + if (ctx.User.Identity?.IsAuthenticated == true) + { + var idClaim = ctx.User.FindFirst(ClaimTypes.NameIdentifier)?.Value; + var name = ctx.User.Identity.Name ?? ""; + if (int.TryParse(idClaim, out var id)) + { + return Results.Ok(new UserInfo { Id = id, Username = name }); + } + } + return Results.Unauthorized(); +}); + +app.MapPost("/api/auth/login", async (HttpContext ctx, [FromBody] LoginRequest req, IAuthService authService) => +{ + var user = await authService.LoginAsync(req.Username, req.Password); + if (user == null) + return Results.BadRequest("Benutzername oder Passwort falsch."); + + var claims = new[] { + new Claim(ClaimTypes.NameIdentifier, user.Id.ToString()), + new Claim(ClaimTypes.Name, user.Username) + }; + var identity = new ClaimsIdentity(claims, CookieAuthenticationDefaults.AuthenticationScheme); + await ctx.SignInAsync(CookieAuthenticationDefaults.AuthenticationScheme, + new ClaimsPrincipal(identity), + new AuthenticationProperties { IsPersistent = true }); + + return Results.Ok(new UserInfo { Id = user.Id, Username = user.Username }); +}); + +app.MapPost("/api/auth/register", async (HttpContext ctx, [FromBody] LoginRequest req, IAuthService authService) => +{ + var (user, error) = await authService.RegisterAsync(req.Username, req.Password); + if (user == null) + return Results.BadRequest(error ?? "Registrierung fehlgeschlagen."); + + var claims = new[] { + new Claim(ClaimTypes.NameIdentifier, user.Id.ToString()), + new Claim(ClaimTypes.Name, user.Username) + }; + var identity = new ClaimsIdentity(claims, CookieAuthenticationDefaults.AuthenticationScheme); + await ctx.SignInAsync(CookieAuthenticationDefaults.AuthenticationScheme, + new ClaimsPrincipal(identity), + new AuthenticationProperties { IsPersistent = true }); + + return Results.Ok(new UserInfo { Id = user.Id, Username = user.Username }); +}); + +app.MapGet("/auth/logout", async (HttpContext ctx) => +{ + await ctx.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme); + return Results.Redirect("/login"); +}); + +// ── Admin-API-Endpoints (Protected) ─────────────────────────────────────────── +var usersApi = app.MapGroup("/api/users").RequireAuthorization("AdminOnly"); + +usersApi.MapGet("/", async (IAuthService authService) => +{ + var users = await authService.GetAllUsersAsync(); + return Results.Ok(users); +}); + +usersApi.MapDelete("/{userId:int}", async (int userId, IAuthService authService) => +{ + await authService.DeleteUserAsync(userId); + return Results.NoContent(); +}); + +usersApi.MapPut("/{userId:int}/rename", async (int userId, [FromBody] RenameRequest req, IAuthService authService) => +{ + var error = await authService.RenameUserAsync(userId, req.Username); + if (error != null) + { + return Results.BadRequest(error); + } + return Results.Ok(); +}); + +// ── Timetracker-API-Endpoints (Protected) ───────────────────────────────────── +var trackerApi = app.MapGroup("/api/tracker").RequireAuthorization(); + +trackerApi.MapGet("/week", async ([FromQuery] int userId, [FromQuery] string monday, ITimetrackerService trackerService) => +{ + if (DateOnly.TryParse(monday, out var date)) + { + var days = await trackerService.GetWeekAsync(userId, date); + return Results.Ok(days); + } + return Results.BadRequest("Ungültiges Datum."); +}); + +trackerApi.MapPost("/workday", async ([FromBody] WorkDay workDay, ITimetrackerService trackerService) => +{ + await trackerService.UpsertWorkDayAsync(workDay); + return Results.Ok(); +}); + +trackerApi.MapGet("/settings/{userId:int}", async (int userId, ITimetrackerService trackerService) => +{ + var settings = await trackerService.GetSettingsAsync(userId); + return Results.Ok(settings); +}); + +trackerApi.MapPost("/settings", async ([FromBody] AppSettings settings, ITimetrackerService trackerService) => +{ + await trackerService.SaveSettingsAsync(settings); + return Results.Ok(); +}); + +trackerApi.MapGet("/vacation/{userId:int}/{year:int}", async (int userId, int year, ITimetrackerService trackerService) => +{ + var days = await trackerService.GetVacationDaysAsync(userId, year); + return Results.Ok(days); +}); + +trackerApi.MapPost("/vacation", async ([FromBody] VacationDay vacationDay, ITimetrackerService trackerService) => +{ + await trackerService.AddVacationDayAsync(vacationDay); + return Results.Ok(); +}); + +trackerApi.MapDelete("/vacation/{userId:int}/{id:int}", async (int userId, int id, ITimetrackerService trackerService) => +{ + await trackerService.RemoveVacationDayAsync(userId, id); + return Results.NoContent(); +}); + +trackerApi.MapPost("/overtime/{userId:int}", async (int userId, [FromBody] AppSettings settings, ITimetrackerService trackerService) => +{ + var ts = await trackerService.GetTotalOvertimeAsync(userId, settings); + return Results.Ok(ts.TotalHours); +}); + +trackerApi.MapGet("/month", async ([FromQuery] int userId, [FromQuery] int year, [FromQuery] int month, ITimetrackerService trackerService) => +{ + var days = await trackerService.GetMonthAsync(userId, year, month); + return Results.Ok(days); +}); + +// ── Holiday-API-Endpoints (Protected) ───────────────────────────────────────── +var holidaysApi = app.MapGroup("/api/holidays").RequireAuthorization(); + +holidaysApi.MapGet("/", async ([FromQuery] int year, [FromQuery] string? stateCode, IHolidayService holidayService) => +{ + var list = await holidayService.GetHolidaysAsync(year, stateCode); + return Results.Ok(list); +}); + +holidaysApi.MapPost("/fetch/{year:int}", async (int year, IHolidayService holidayService) => +{ + var (success, message) = await holidayService.FetchAndStoreAsync(year); + return Results.Ok(new { Success = success, Message = message }); +}); + +holidaysApi.MapDelete("/{id:int}", async (int id, IHolidayService holidayService) => +{ + await holidayService.DeleteAsync(id); + return Results.NoContent(); +}); + +app.Run(); + +// ── Models for Request Bodies ────────────────────────────────────────────────── +public record LoginRequest(string Username, string Password); +public record RenameRequest(string Username); diff --git a/Properties/launchSettings.json b/timetracker.Server/Properties/launchSettings.json similarity index 100% rename from Properties/launchSettings.json rename to timetracker.Server/Properties/launchSettings.json diff --git a/appsettings.Development.json b/timetracker.Server/appsettings.Development.json similarity index 100% rename from appsettings.Development.json rename to timetracker.Server/appsettings.Development.json diff --git a/appsettings.json b/timetracker.Server/appsettings.json similarity index 100% rename from appsettings.json rename to timetracker.Server/appsettings.json diff --git a/timetracker.csproj b/timetracker.Server/timetracker.Server.csproj similarity index 59% rename from timetracker.csproj rename to timetracker.Server/timetracker.Server.csproj index f130a2d..930c641 100644 --- a/timetracker.csproj +++ b/timetracker.Server/timetracker.Server.csproj @@ -8,9 +8,16 @@ + + + + + + + diff --git a/wwwroot/app.css b/timetracker.Server/wwwroot/app.css similarity index 100% rename from wwwroot/app.css rename to timetracker.Server/wwwroot/app.css diff --git a/wwwroot/favicon.png b/timetracker.Server/wwwroot/favicon.png similarity index 100% rename from wwwroot/favicon.png rename to timetracker.Server/wwwroot/favicon.png diff --git a/wwwroot/favicon.svg b/timetracker.Server/wwwroot/favicon.svg similarity index 100% rename from wwwroot/favicon.svg rename to timetracker.Server/wwwroot/favicon.svg diff --git a/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css b/timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css similarity index 100% rename from wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css rename to timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css diff --git a/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map b/timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map similarity index 100% rename from wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map rename to timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map diff --git a/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css b/timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css similarity index 100% rename from wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css rename to timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css diff --git a/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map b/timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map similarity index 100% rename from wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map rename to timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map diff --git a/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.css b/timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.css similarity index 100% rename from wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.css rename to timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.css diff --git a/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.css.map b/timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.css.map similarity index 100% rename from wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.css.map rename to timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.css.map diff --git a/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.min.css b/timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.min.css similarity index 100% rename from wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.min.css rename to timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.min.css diff --git a/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.min.css.map b/timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.min.css.map similarity index 100% rename from wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.min.css.map rename to timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.min.css.map diff --git a/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css b/timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css similarity index 100% rename from wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css rename to timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css diff --git a/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map b/timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map similarity index 100% rename from wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map rename to timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map diff --git a/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css b/timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css similarity index 100% rename from wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css rename to timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css diff --git a/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map b/timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map similarity index 100% rename from wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map rename to timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map diff --git a/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.css b/timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.css similarity index 100% rename from wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.css rename to timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.css diff --git a/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.css.map b/timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.css.map similarity index 100% rename from wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.css.map rename to timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.css.map diff --git a/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.min.css b/timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.min.css similarity index 100% rename from wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.min.css rename to timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.min.css diff --git a/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.min.css.map b/timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.min.css.map similarity index 100% rename from wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.min.css.map rename to timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.min.css.map diff --git a/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.css b/timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.css similarity index 100% rename from wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.css rename to timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.css diff --git a/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.css.map b/timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.css.map similarity index 100% rename from wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.css.map rename to timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.css.map diff --git a/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.min.css b/timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.min.css similarity index 100% rename from wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.min.css rename to timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.min.css diff --git a/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.min.css.map b/timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.min.css.map similarity index 100% rename from wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.min.css.map rename to timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.min.css.map diff --git a/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.css b/timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.css similarity index 100% rename from wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.css rename to timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.css diff --git a/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.css.map b/timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.css.map similarity index 100% rename from wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.css.map rename to timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.css.map diff --git a/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.min.css b/timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.min.css similarity index 100% rename from wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.min.css rename to timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.min.css diff --git a/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.min.css.map b/timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.min.css.map similarity index 100% rename from wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.min.css.map rename to timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.min.css.map diff --git a/wwwroot/lib/bootstrap/dist/css/bootstrap.css b/timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap.css similarity index 100% rename from wwwroot/lib/bootstrap/dist/css/bootstrap.css rename to timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap.css diff --git a/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map b/timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map similarity index 100% rename from wwwroot/lib/bootstrap/dist/css/bootstrap.css.map rename to timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map diff --git a/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css b/timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css similarity index 100% rename from wwwroot/lib/bootstrap/dist/css/bootstrap.min.css rename to timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css diff --git a/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map b/timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map similarity index 100% rename from wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map rename to timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map diff --git a/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.css b/timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.css similarity index 100% rename from wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.css rename to timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.css diff --git a/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.css.map b/timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.css.map similarity index 100% rename from wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.css.map rename to timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.css.map diff --git a/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.min.css b/timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.min.css similarity index 100% rename from wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.min.css rename to timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.min.css diff --git a/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.min.css.map b/timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.min.css.map similarity index 100% rename from wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.min.css.map rename to timetracker.Server/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.min.css.map diff --git a/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js b/timetracker.Server/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js similarity index 100% rename from wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js rename to timetracker.Server/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js diff --git a/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map b/timetracker.Server/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map similarity index 100% rename from wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map rename to timetracker.Server/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map diff --git a/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js b/timetracker.Server/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js similarity index 100% rename from wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js rename to timetracker.Server/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js diff --git a/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map b/timetracker.Server/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map similarity index 100% rename from wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map rename to timetracker.Server/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map diff --git a/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.js b/timetracker.Server/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.js similarity index 100% rename from wwwroot/lib/bootstrap/dist/js/bootstrap.esm.js rename to timetracker.Server/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.js diff --git a/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.js.map b/timetracker.Server/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.js.map similarity index 100% rename from wwwroot/lib/bootstrap/dist/js/bootstrap.esm.js.map rename to timetracker.Server/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.js.map diff --git a/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.min.js b/timetracker.Server/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.min.js similarity index 100% rename from wwwroot/lib/bootstrap/dist/js/bootstrap.esm.min.js rename to timetracker.Server/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.min.js diff --git a/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.min.js.map b/timetracker.Server/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.min.js.map similarity index 100% rename from wwwroot/lib/bootstrap/dist/js/bootstrap.esm.min.js.map rename to timetracker.Server/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.min.js.map diff --git a/wwwroot/lib/bootstrap/dist/js/bootstrap.js b/timetracker.Server/wwwroot/lib/bootstrap/dist/js/bootstrap.js similarity index 100% rename from wwwroot/lib/bootstrap/dist/js/bootstrap.js rename to timetracker.Server/wwwroot/lib/bootstrap/dist/js/bootstrap.js diff --git a/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map b/timetracker.Server/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map similarity index 100% rename from wwwroot/lib/bootstrap/dist/js/bootstrap.js.map rename to timetracker.Server/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map diff --git a/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js b/timetracker.Server/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js similarity index 100% rename from wwwroot/lib/bootstrap/dist/js/bootstrap.min.js rename to timetracker.Server/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js diff --git a/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map b/timetracker.Server/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map similarity index 100% rename from wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map rename to timetracker.Server/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map diff --git a/Data/AppSettings.cs b/timetracker.Shared/AppSettings.cs similarity index 97% rename from Data/AppSettings.cs rename to timetracker.Shared/AppSettings.cs index 3f13378..a7a8ad0 100644 --- a/Data/AppSettings.cs +++ b/timetracker.Shared/AppSettings.cs @@ -1,4 +1,4 @@ -namespace timetracker.Data; +namespace timetracker.Shared; public class AppSettings { diff --git a/Data/BreakEntry.cs b/timetracker.Shared/BreakEntry.cs similarity index 75% rename from Data/BreakEntry.cs rename to timetracker.Shared/BreakEntry.cs index b32eb0d..99d93dd 100644 --- a/Data/BreakEntry.cs +++ b/timetracker.Shared/BreakEntry.cs @@ -1,9 +1,10 @@ -namespace timetracker.Data; +namespace timetracker.Shared; public class BreakEntry { public int Id { get; set; } public int WorkDayId { get; set; } + [System.Text.Json.Serialization.JsonIgnore] public WorkDay WorkDay { get; set; } = null!; public TimeOnly? StartTime { get; set; } public TimeOnly? EndTime { get; set; } diff --git a/timetracker.Shared/IAuthService.cs b/timetracker.Shared/IAuthService.cs new file mode 100644 index 0000000..e99f167 --- /dev/null +++ b/timetracker.Shared/IAuthService.cs @@ -0,0 +1,10 @@ +namespace timetracker.Shared; + +public interface IAuthService +{ + Task LoginAsync(string username, string password); + Task> GetAllUsersAsync(); + Task DeleteUserAsync(int userId); + Task RenameUserAsync(int userId, string newUsername); + Task<(User? User, string? Error)> RegisterAsync(string username, string password); +} diff --git a/timetracker.Shared/IHolidayService.cs b/timetracker.Shared/IHolidayService.cs new file mode 100644 index 0000000..031165b --- /dev/null +++ b/timetracker.Shared/IHolidayService.cs @@ -0,0 +1,8 @@ +namespace timetracker.Shared; + +public interface IHolidayService +{ + Task> GetHolidaysAsync(int year, string? stateCode = null); + Task<(bool Success, string Message)> FetchAndStoreAsync(int year); + Task DeleteAsync(int id); +} diff --git a/timetracker.Shared/ITimetrackerService.cs b/timetracker.Shared/ITimetrackerService.cs new file mode 100644 index 0000000..abaf9fe --- /dev/null +++ b/timetracker.Shared/ITimetrackerService.cs @@ -0,0 +1,14 @@ +namespace timetracker.Shared; + +public interface ITimetrackerService +{ + Task> GetWeekAsync(int userId, DateOnly monday); + Task UpsertWorkDayAsync(WorkDay workDay); + Task GetSettingsAsync(int userId); + Task SaveSettingsAsync(AppSettings settings); + Task> GetVacationDaysAsync(int userId, int year); + Task AddVacationDayAsync(VacationDay vacationDay); + Task RemoveVacationDayAsync(int userId, int id); + Task GetTotalOvertimeAsync(int userId, AppSettings settings); + Task> GetMonthAsync(int userId, int year, int month); +} diff --git a/timetracker.Shared/IUserNotificationService.cs b/timetracker.Shared/IUserNotificationService.cs new file mode 100644 index 0000000..f3be7a3 --- /dev/null +++ b/timetracker.Shared/IUserNotificationService.cs @@ -0,0 +1,7 @@ +namespace timetracker.Shared; + +public interface IUserNotificationService +{ + event Func? OnUsersChanged; + event Func? OnUserDeleted; +} diff --git a/Data/PublicHoliday.cs b/timetracker.Shared/PublicHoliday.cs similarity index 86% rename from Data/PublicHoliday.cs rename to timetracker.Shared/PublicHoliday.cs index 97262ac..2fd14c3 100644 --- a/Data/PublicHoliday.cs +++ b/timetracker.Shared/PublicHoliday.cs @@ -1,4 +1,4 @@ -namespace timetracker.Data; +namespace timetracker.Shared; public class PublicHoliday { diff --git a/Data/User.cs b/timetracker.Shared/User.cs similarity index 87% rename from Data/User.cs rename to timetracker.Shared/User.cs index 5b64987..a339b3f 100644 --- a/Data/User.cs +++ b/timetracker.Shared/User.cs @@ -1,4 +1,4 @@ -namespace timetracker.Data; +namespace timetracker.Shared; public class User { diff --git a/timetracker.Shared/UserInfo.cs b/timetracker.Shared/UserInfo.cs new file mode 100644 index 0000000..67ed616 --- /dev/null +++ b/timetracker.Shared/UserInfo.cs @@ -0,0 +1,7 @@ +namespace timetracker.Shared; + +public class UserInfo +{ + public int Id { get; set; } + public string Username { get; set; } = ""; +} diff --git a/Data/VacationDay.cs b/timetracker.Shared/VacationDay.cs similarity index 85% rename from Data/VacationDay.cs rename to timetracker.Shared/VacationDay.cs index 6dd019c..781d256 100644 --- a/Data/VacationDay.cs +++ b/timetracker.Shared/VacationDay.cs @@ -1,4 +1,4 @@ -namespace timetracker.Data; +namespace timetracker.Shared; public class VacationDay { diff --git a/Data/WorkDay.cs b/timetracker.Shared/WorkDay.cs similarity index 90% rename from Data/WorkDay.cs rename to timetracker.Shared/WorkDay.cs index dcaa71c..1330ffc 100644 --- a/Data/WorkDay.cs +++ b/timetracker.Shared/WorkDay.cs @@ -1,4 +1,4 @@ -namespace timetracker.Data; +namespace timetracker.Shared; public class WorkDay { diff --git a/timetracker.Shared/timetracker.Shared.csproj b/timetracker.Shared/timetracker.Shared.csproj new file mode 100644 index 0000000..b760144 --- /dev/null +++ b/timetracker.Shared/timetracker.Shared.csproj @@ -0,0 +1,9 @@ + + + + net10.0 + enable + enable + + + diff --git a/timetracker.db b/timetracker.db deleted file mode 100644 index 5ed71f7..0000000 Binary files a/timetracker.db and /dev/null differ diff --git a/timetracker.slnx b/timetracker.slnx new file mode 100644 index 0000000..d14bb15 --- /dev/null +++ b/timetracker.slnx @@ -0,0 +1,5 @@ + + + + +