Compare commits
14 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 MarcWieland
|
94c10aebdd | ||
|
MarcWieland
|
ddb2b4af9f | ||
|
MarcWieland
|
1def618e34 | ||
|
MarcWieland
|
2029524379 | ||
|
MarcWieland
|
f92dd2659c | ||
|
MarcWieland
|
82626bc5b3 | ||
 mrcwlnd
|
b8b01871ed | ||
|
MarcWieland
|
d79ee1671d | ||
|
mrcwlnd
|
69a38761f3 | ||
|
MarcWieland
|
708aa3991a | ||
|
mrcwlnd
|
3f262910ad | ||
|
MarcWieland
|
b3e578308f | ||
|
mrcwlnd
|
ed36d0e1ec | ||
|
MarcWieland
|
58e562adb1 |
Binary file not shown.
|
After Width: | Height: | Size: 5.5 MiB |
@@ -1,26 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html lang="en">
|
|
||||||
|
|
||||||
<head>
|
|
||||||
<meta charset="utf-8" />
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
|
||||||
<base href="/" />
|
|
||||||
<ResourcePreloader />
|
|
||||||
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" />
|
|
||||||
<link rel="stylesheet" href="_content/MudBlazor/MudBlazor.min.css" />
|
|
||||||
<link rel="stylesheet" href="@Assets["app.css"]" />
|
|
||||||
<link rel="stylesheet" href="@Assets["timetracker.styles.css"]" />
|
|
||||||
<ImportMap />
|
|
||||||
<link rel="icon" type="image/svg+xml" href="favicon.svg" />
|
|
||||||
<link rel="alternate icon" type="image/png" href="favicon.png" />
|
|
||||||
<HeadOutlet />
|
|
||||||
</head>
|
|
||||||
|
|
||||||
<body>
|
|
||||||
<Routes />
|
|
||||||
<ReconnectModal />
|
|
||||||
<script src="@Assets["_framework/blazor.web.js"]"></script>
|
|
||||||
<script src="_content/MudBlazor/MudBlazor.min.js"></script>
|
|
||||||
</body>
|
|
||||||
|
|
||||||
</html>
|
|
||||||
@@ -1,76 +0,0 @@
|
|||||||
@inherits LayoutComponentBase
|
|
||||||
@inject AuthenticationStateProvider AuthStateProvider
|
|
||||||
@inject NavigationManager Nav
|
|
||||||
@inject timetracker.Data.UserNotificationService UserNotificationService
|
|
||||||
@implements IDisposable
|
|
||||||
@using System.Security.Claims
|
|
||||||
|
|
||||||
<MudThemeProvider Theme="_theme" />
|
|
||||||
<MudPopoverProvider />
|
|
||||||
<MudDialogProvider />
|
|
||||||
<MudSnackbarProvider />
|
|
||||||
|
|
||||||
<MudLayout>
|
|
||||||
<MudAppBar Elevation="2" Style="background: linear-gradient(90deg, #3F51B5 0%, #1A237E 100%);">
|
|
||||||
<MudIconButton Icon="@Icons.Material.Filled.Menu" Color="Color.Inherit" Edge="Edge.Start" OnClick="ToggleDrawer" />
|
|
||||||
<MudStack Row="true" AlignItems="AlignItems.Center" Spacing="2" Class="ml-2">
|
|
||||||
<MudIcon Icon="@Icons.Material.Filled.AccessTime" Style="color:white; font-size:1.6rem" />
|
|
||||||
<MudText Typo="Typo.h6" Style="color:white; font-weight:700; letter-spacing:0.5px">Timetracker</MudText>
|
|
||||||
</MudStack>
|
|
||||||
<MudSpacer />
|
|
||||||
</MudAppBar>
|
|
||||||
|
|
||||||
<MudDrawer @bind-Open="_drawerOpen" ClipMode="DrawerClipMode.Always" Elevation="2">
|
|
||||||
<NavMenu />
|
|
||||||
</MudDrawer>
|
|
||||||
|
|
||||||
<MudMainContent>
|
|
||||||
<MudContainer MaxWidth="MaxWidth.Large" Class="mt-4 pb-8">
|
|
||||||
@Body
|
|
||||||
</MudContainer>
|
|
||||||
</MudMainContent>
|
|
||||||
</MudLayout>
|
|
||||||
|
|
||||||
@code {
|
|
||||||
private bool _drawerOpen = true;
|
|
||||||
|
|
||||||
protected override void OnInitialized()
|
|
||||||
{
|
|
||||||
UserNotificationService.OnUserDeleted += HandleUserDeleted;
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task HandleUserDeleted(int deletedUserId)
|
|
||||||
{
|
|
||||||
var state = await AuthStateProvider.GetAuthenticationStateAsync();
|
|
||||||
var idClaim = state.User.FindFirst(ClaimTypes.NameIdentifier)?.Value;
|
|
||||||
if (idClaim != null && int.TryParse(idClaim, out var myId) && myId == deletedUserId)
|
|
||||||
{
|
|
||||||
await InvokeAsync(() => Nav.NavigateTo("/auth/logout", forceLoad: true));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Dispose()
|
|
||||||
{
|
|
||||||
UserNotificationService.OnUserDeleted -= HandleUserDeleted;
|
|
||||||
}
|
|
||||||
|
|
||||||
private readonly MudTheme _theme = new()
|
|
||||||
{
|
|
||||||
PaletteLight = new PaletteLight
|
|
||||||
{
|
|
||||||
Primary = "#3F51B5",
|
|
||||||
PrimaryDarken = "#1A237E",
|
|
||||||
PrimaryLighten = "#7986CB",
|
|
||||||
Secondary = "#009688",
|
|
||||||
SecondaryDarken = "#00695C",
|
|
||||||
AppbarBackground = "#3F51B5",
|
|
||||||
Background = "#F4F6F9",
|
|
||||||
DrawerBackground = "#FFFFFF",
|
|
||||||
Surface = "#FFFFFF",
|
|
||||||
TextPrimary = "#212121",
|
|
||||||
TextSecondary = "#757575",
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
private void ToggleDrawer() => _drawerOpen = !_drawerOpen;
|
|
||||||
}
|
|
||||||
@@ -1,98 +0,0 @@
|
|||||||
.page {
|
|
||||||
position: relative;
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
}
|
|
||||||
|
|
||||||
main {
|
|
||||||
flex: 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
.sidebar {
|
|
||||||
background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%);
|
|
||||||
}
|
|
||||||
|
|
||||||
.top-row {
|
|
||||||
background-color: #f7f7f7;
|
|
||||||
border-bottom: 1px solid #d6d5d5;
|
|
||||||
justify-content: flex-end;
|
|
||||||
height: 3.5rem;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
.top-row ::deep a, .top-row ::deep .btn-link {
|
|
||||||
white-space: nowrap;
|
|
||||||
margin-left: 1.5rem;
|
|
||||||
text-decoration: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.top-row ::deep a:hover, .top-row ::deep .btn-link:hover {
|
|
||||||
text-decoration: underline;
|
|
||||||
}
|
|
||||||
|
|
||||||
.top-row ::deep a:first-child {
|
|
||||||
overflow: hidden;
|
|
||||||
text-overflow: ellipsis;
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (max-width: 640.98px) {
|
|
||||||
.top-row {
|
|
||||||
justify-content: space-between;
|
|
||||||
}
|
|
||||||
|
|
||||||
.top-row ::deep a, .top-row ::deep .btn-link {
|
|
||||||
margin-left: 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (min-width: 641px) {
|
|
||||||
.page {
|
|
||||||
flex-direction: row;
|
|
||||||
}
|
|
||||||
|
|
||||||
.sidebar {
|
|
||||||
width: 250px;
|
|
||||||
height: 100vh;
|
|
||||||
position: sticky;
|
|
||||||
top: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.top-row {
|
|
||||||
position: sticky;
|
|
||||||
top: 0;
|
|
||||||
z-index: 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
.top-row.auth ::deep a:first-child {
|
|
||||||
flex: 1;
|
|
||||||
text-align: right;
|
|
||||||
width: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.top-row, article {
|
|
||||||
padding-left: 2rem !important;
|
|
||||||
padding-right: 1.5rem !important;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#blazor-error-ui {
|
|
||||||
color-scheme: light only;
|
|
||||||
background: lightyellow;
|
|
||||||
bottom: 0;
|
|
||||||
box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2);
|
|
||||||
box-sizing: border-box;
|
|
||||||
display: none;
|
|
||||||
left: 0;
|
|
||||||
padding: 0.6rem 1.25rem 0.7rem 1.25rem;
|
|
||||||
position: fixed;
|
|
||||||
width: 100%;
|
|
||||||
z-index: 1000;
|
|
||||||
}
|
|
||||||
|
|
||||||
#blazor-error-ui .dismiss {
|
|
||||||
cursor: pointer;
|
|
||||||
position: absolute;
|
|
||||||
right: 0.75rem;
|
|
||||||
top: 0.5rem;
|
|
||||||
}
|
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
<div style="display:flex; flex-direction:column; height:100%;">
|
|
||||||
<MudNavMenu Style="flex:1">
|
|
||||||
<MudDivider Class="mb-2" />
|
|
||||||
<MudNavLink Href="" Match="NavLinkMatch.All" Icon="@Icons.Material.Filled.CalendarMonth">Wochenübersicht</MudNavLink>
|
|
||||||
<MudNavLink Href="month" Icon="@Icons.Material.Filled.CalendarViewMonth">Monatsübersicht</MudNavLink>
|
|
||||||
<MudNavLink Href="feiertage" Icon="@Icons.Material.Filled.Celebration">Feiertage</MudNavLink>
|
|
||||||
<MudNavLink Href="urlaub-maximizer" Icon="@Icons.Material.Filled.AutoAwesome">Urlaubs-Maximizer</MudNavLink>
|
|
||||||
<MudNavLink Href="settings" Icon="@Icons.Material.Filled.Settings">Einstellungen</MudNavLink>
|
|
||||||
<MudDivider Class="mt-2 mb-2" />
|
|
||||||
<AuthorizeView Policy="AdminOnly">
|
|
||||||
<MudNavLink Href="admin/users" Icon="@Icons.Material.Filled.AdminPanelSettings" IconColor="Color.Error">
|
|
||||||
Benutzerverwaltung
|
|
||||||
</MudNavLink>
|
|
||||||
</AuthorizeView>
|
|
||||||
</MudNavMenu>
|
|
||||||
<AuthorizeView>
|
|
||||||
<Authorized>
|
|
||||||
<MudDivider />
|
|
||||||
<MudStack Row="true" AlignItems="AlignItems.Center" Class="px-4 py-2" Spacing="1">
|
|
||||||
<MudIcon Icon="@Icons.Material.Filled.AccountCircle" Color="Color.Primary" Size="Size.Small" />
|
|
||||||
<MudText Typo="Typo.body2" Style="font-weight:600">@context.User.Identity?.Name</MudText>
|
|
||||||
</MudStack>
|
|
||||||
<MudNavMenu>
|
|
||||||
<MudNavLink Href="/auth/logout" Icon="@Icons.Material.Filled.Logout">Abmelden</MudNavLink>
|
|
||||||
</MudNavMenu>
|
|
||||||
</Authorized>
|
|
||||||
</AuthorizeView>
|
|
||||||
<MudTooltip Text="Changelog anzeigen" Placement="Placement.Top">
|
|
||||||
<MudNavMenu>
|
|
||||||
<MudNavLink Href="/changelog" Icon="@Icons.Material.Filled.NewReleases"
|
|
||||||
Style="color: var(--mud-palette-text-disabled); font-size:0.75rem;">
|
|
||||||
Version 1.1
|
|
||||||
</MudNavLink>
|
|
||||||
</MudNavMenu>
|
|
||||||
</MudTooltip>
|
|
||||||
</div>
|
|
||||||
@@ -1,105 +0,0 @@
|
|||||||
.navbar-toggler {
|
|
||||||
appearance: none;
|
|
||||||
cursor: pointer;
|
|
||||||
width: 3.5rem;
|
|
||||||
height: 2.5rem;
|
|
||||||
color: white;
|
|
||||||
position: absolute;
|
|
||||||
top: 0.5rem;
|
|
||||||
right: 1rem;
|
|
||||||
border: 1px solid rgba(255, 255, 255, 0.1);
|
|
||||||
background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%28255, 255, 255, 0.55%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e") no-repeat center/1.75rem rgba(255, 255, 255, 0.1);
|
|
||||||
}
|
|
||||||
|
|
||||||
.navbar-toggler:checked {
|
|
||||||
background-color: rgba(255, 255, 255, 0.5);
|
|
||||||
}
|
|
||||||
|
|
||||||
.top-row {
|
|
||||||
min-height: 3.5rem;
|
|
||||||
background-color: rgba(0,0,0,0.4);
|
|
||||||
}
|
|
||||||
|
|
||||||
.navbar-brand {
|
|
||||||
font-size: 1.1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.bi {
|
|
||||||
display: inline-block;
|
|
||||||
position: relative;
|
|
||||||
width: 1.25rem;
|
|
||||||
height: 1.25rem;
|
|
||||||
margin-right: 0.75rem;
|
|
||||||
top: -1px;
|
|
||||||
background-size: cover;
|
|
||||||
}
|
|
||||||
|
|
||||||
.bi-house-door-fill-nav-menu {
|
|
||||||
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-house-door-fill' viewBox='0 0 16 16'%3E%3Cpath d='M6.5 14.5v-3.505c0-.245.25-.495.5-.495h2c.25 0 .5.25.5.5v3.5a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5v-7a.5.5 0 0 0-.146-.354L13 5.793V2.5a.5.5 0 0 0-.5-.5h-1a.5.5 0 0 0-.5.5v1.293L8.354 1.146a.5.5 0 0 0-.708 0l-6 6A.5.5 0 0 0 1.5 7.5v7a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5Z'/%3E%3C/svg%3E");
|
|
||||||
}
|
|
||||||
|
|
||||||
.bi-plus-square-fill-nav-menu {
|
|
||||||
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-plus-square-fill' viewBox='0 0 16 16'%3E%3Cpath d='M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2zm6.5 4.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3a.5.5 0 0 1 1 0z'/%3E%3C/svg%3E");
|
|
||||||
}
|
|
||||||
|
|
||||||
.bi-list-nested-nav-menu {
|
|
||||||
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-list-nested' viewBox='0 0 16 16'%3E%3Cpath fill-rule='evenodd' d='M4.5 11.5A.5.5 0 0 1 5 11h10a.5.5 0 0 1 0 1H5a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 3 7h10a.5.5 0 0 1 0 1H3a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 1 3h10a.5.5 0 0 1 0 1H1a.5.5 0 0 1-.5-.5z'/%3E%3C/svg%3E");
|
|
||||||
}
|
|
||||||
|
|
||||||
.nav-item {
|
|
||||||
font-size: 0.9rem;
|
|
||||||
padding-bottom: 0.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.nav-item:first-of-type {
|
|
||||||
padding-top: 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.nav-item:last-of-type {
|
|
||||||
padding-bottom: 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.nav-item ::deep .nav-link {
|
|
||||||
color: #d7d7d7;
|
|
||||||
background: none;
|
|
||||||
border: none;
|
|
||||||
border-radius: 4px;
|
|
||||||
height: 3rem;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
line-height: 3rem;
|
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
.nav-item ::deep a.active {
|
|
||||||
background-color: rgba(255,255,255,0.37);
|
|
||||||
color: white;
|
|
||||||
}
|
|
||||||
|
|
||||||
.nav-item ::deep .nav-link:hover {
|
|
||||||
background-color: rgba(255,255,255,0.1);
|
|
||||||
color: white;
|
|
||||||
}
|
|
||||||
|
|
||||||
.nav-scrollable {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.navbar-toggler:checked ~ .nav-scrollable {
|
|
||||||
display: block;
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (min-width: 641px) {
|
|
||||||
.navbar-toggler {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.nav-scrollable {
|
|
||||||
/* Never collapse the sidebar for wide screens */
|
|
||||||
display: block;
|
|
||||||
|
|
||||||
/* Allow sidebar to scroll for tall menus */
|
|
||||||
height: calc(100vh - 3.5rem);
|
|
||||||
overflow-y: auto;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
<script type="module" src="@Assets["Components/Layout/ReconnectModal.razor.js"]"></script>
|
|
||||||
|
|
||||||
<dialog id="components-reconnect-modal" data-nosnippet>
|
|
||||||
<div class="components-reconnect-container">
|
|
||||||
<div class="components-rejoining-animation" aria-hidden="true">
|
|
||||||
<div></div>
|
|
||||||
<div></div>
|
|
||||||
</div>
|
|
||||||
<p class="components-reconnect-first-attempt-visible">
|
|
||||||
Rejoining the server...
|
|
||||||
</p>
|
|
||||||
<p class="components-reconnect-repeated-attempt-visible">
|
|
||||||
Rejoin failed... trying again in <span id="components-seconds-to-next-attempt"></span> seconds.
|
|
||||||
</p>
|
|
||||||
<p class="components-reconnect-failed-visible">
|
|
||||||
Failed to rejoin.<br />Please retry or reload the page.
|
|
||||||
</p>
|
|
||||||
<button id="components-reconnect-button" class="components-reconnect-failed-visible">
|
|
||||||
Retry
|
|
||||||
</button>
|
|
||||||
<p class="components-pause-visible">
|
|
||||||
The session has been paused by the server.
|
|
||||||
</p>
|
|
||||||
<p class="components-resume-failed-visible">
|
|
||||||
Failed to resume the session.<br />Please retry or reload the page.
|
|
||||||
</p>
|
|
||||||
<button id="components-resume-button" class="components-pause-visible components-resume-failed-visible">
|
|
||||||
Resume
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</dialog>
|
|
||||||
@@ -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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -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();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
namespace timetracker.Data;
|
|
||||||
|
|
||||||
public class UserNotificationService
|
|
||||||
{
|
|
||||||
public event Func<Task>? OnUsersChanged;
|
|
||||||
public event Func<int, Task>? OnUserDeleted;
|
|
||||||
|
|
||||||
public async Task NotifyUsersChangedAsync()
|
|
||||||
{
|
|
||||||
if (OnUsersChanged != null)
|
|
||||||
await OnUsersChanged.Invoke();
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task NotifyUserDeletedAsync(int userId)
|
|
||||||
{
|
|
||||||
if (OnUserDeleted != null)
|
|
||||||
await OnUserDeleted.Invoke(userId);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-132
@@ -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<timetracker.Data.UserNotificationService>();
|
|
||||||
builder.Services.AddScoped<AuthService>();
|
|
||||||
|
|
||||||
// Add services to the container.
|
|
||||||
builder.Services.AddRazorComponents()
|
|
||||||
.AddInteractiveServerComponents();
|
|
||||||
builder.Services.AddMudServices();
|
|
||||||
builder.Services.AddHttpClient<HolidayService>();
|
|
||||||
|
|
||||||
var dbPath = Environment.GetEnvironmentVariable("TIMETRACKER_DB_PATH")
|
|
||||||
?? Path.Combine(builder.Environment.ContentRootPath, "timetracker.db");
|
|
||||||
builder.Services.AddDbContextFactory<TimetrackerDbContext>(options =>
|
|
||||||
options.UseSqlite($"Data Source={dbPath}"));
|
|
||||||
builder.Services.AddScoped<TimetrackerService>();
|
|
||||||
|
|
||||||
var app = builder.Build();
|
|
||||||
|
|
||||||
using (var scope = app.Services.CreateScope())
|
|
||||||
{
|
|
||||||
var factory = scope.ServiceProvider.GetRequiredService<IDbContextFactory<TimetrackerDbContext>>();
|
|
||||||
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<App>()
|
|
||||||
.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();
|
|
||||||
+21
-7
@@ -1,22 +1,36 @@
|
|||||||
version: '3.8'
|
version: '3.8'
|
||||||
|
|
||||||
services:
|
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:
|
timetracker:
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
dockerfile: Dockerfile
|
dockerfile: timetracker.Server/Dockerfile
|
||||||
container_name: timetracker-app
|
container_name: timetracker-app
|
||||||
restart: always
|
restart: always
|
||||||
ports:
|
ports:
|
||||||
- "8090:8080"
|
- "8090:8080"
|
||||||
environment:
|
environment:
|
||||||
- ASPNETCORE_ENVIRONMENT=Production
|
- ASPNETCORE_ENVIRONMENT=Production
|
||||||
- ASPNETCORE_HTTP_PORTS=8080 # Lassen wir so, da intern völlig okay
|
- ASPNETCORE_HTTP_PORTS=8080
|
||||||
- TIMETRACKER_DB_PATH=/data/timetracker.db
|
- DB_PROVIDER=PostgreSQL
|
||||||
|
- ConnectionStrings__DefaultConnection=Host=db;Database=timetracker;Username=timetracker_user;Password=SecretPassword123;
|
||||||
- EnableHttpsRedirect=false
|
- EnableHttpsRedirect=false
|
||||||
volumes:
|
depends_on:
|
||||||
- timetracker_data:/data
|
- db
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
timetracker_data:
|
pgdata:
|
||||||
name: timetracker_prod_data
|
name: timetracker_pgdata
|
||||||
@@ -0,0 +1,73 @@
|
|||||||
|
# Brainstorming & Zukunfts-Ideen für den Timetracker
|
||||||
|
|
||||||
|
Der Timetracker ist durch die Umstellung auf eine Hosted Blazor WebAssembly (.NET 10) Architektur mit PostgreSQL-Unterstützung extrem solide und zukunftssicher aufgestellt. Hier sind einige spannende, innovative Produktideen, um das Tool auf das nächste Level zu heben:
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 🚀 1. PWA-Support (Progressive Web App) und Offline-Modus
|
||||||
|
* **Offline-Erfassung**: Da die App in Blazor WebAssembly im Browser läuft, lässt sie sich leicht zu einer PWA umrüsten. Zeiterfassungen könnten lokal im `IndexedDB`-Speicher des Browsers gesichert werden, wenn keine Internetverbindung besteht, und bei Wiederverbindung automatisch mit der PostgreSQL-Datenbank synchronisiert werden.
|
||||||
|
* **Mobiles App-Feeling**: Installation direkt auf dem Homescreen (Android/iOS) ohne App-Store-Zwang.
|
||||||
|
* **Web-Push Notifications**: Tägliche Erinnerungen, falls man vergisst, sich auszustempeln oder Pausen einzutragen.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 🤖 2. KI-Assistent & Smart-Suggestions
|
||||||
|
* **Kalender- & Git-Sync**: Einbindung einer KI-Schnittstelle, die Zugriff auf Terminkalender (Google/Outlook) oder lokale Git-Commits hat. Sie schlägt am Ende des Tages automatisch passende Buchungen vor (z. B. *"Du hast von 10-11 Uhr am Feature X gearbeitet. Möchtest du das buchen?"*).
|
||||||
|
* **Ausreißer-Erkennung**: KI-gestützte Warnungen, wenn Zeiten untypisch erfasst wurden (z. B. 12 Stunden gearbeitet ohne Pause).
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 📅 3. Kalender-Integration & Feiertags-Automatisierung
|
||||||
|
* **Direktes Feiertags-Abonnement**: Automatische Erkennung des Bundeslandes und Import der Feiertage ohne manuellen Klick auf "Von API laden" zu Beginn des Jahres.
|
||||||
|
* **Kalender-Export (iCal)**: Generierung eines persönlichen iCal-Feeds, damit der User seine gebuchten Urlaubstage und Überstunden in seinem primären Kalender (Google Calendar, Apple Calendar) sieht.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 👥 4. Team-Features & Urlaubsplaner
|
||||||
|
* **Wer-ist-da-Dashboard**: Ein Live-Statusboard für Teams, auf dem man sieht, wer gerade eingestempelt ist, wer Pause macht oder wer heute Urlaub hat/krankgeschrieben ist.
|
||||||
|
* **Gemeinsamer Urlaubskalender**: Ein Kalender für das gesamte Team, um Urlaubsüberschneidungen direkt zu erkennen und Freigabeprozesse durch Admins zu ermöglichen.
|
||||||
|
* **Rollenkonzepte**: Einführung von Teamleitern (können Zeiten der Mitglieder freigeben) und Standard-Mitarbeitern.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 📊 5. Reporting & Abrechnung (Billing)
|
||||||
|
* **Rechnungserstellung**: Verknüpfung von erfassten Zeiten mit Stundensätzen, um mit einem Klick professionelle PDF-Rechnungen an Kunden zu erstellen.
|
||||||
|
* **Auswertungen**: Interaktive Diagramme (z.B. mittels MudBlazor Charts) zur Analyse von Arbeitszeiten, Überstundenentwicklung und Krankheitstagen über das Jahr verteilt.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 🔌 6. Integrationen (Jira, GitHub, Slack)
|
||||||
|
* **Git-Hooks / CLI**: Automatisches Starten/Stoppen von Timern per CLI oder bei Git-Commits.
|
||||||
|
* **Slack / Teams Chatbot**: Schnelles Ein- und Ausstempeln direkt aus dem Chat-Client heraus über Befehle wie `/track start` oder `/track pause`.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 🔒 7. Sicherheit & DSGVO
|
||||||
|
* **Audit Logs**: Transparente Historie darüber, wer wann welche Zeiten geändert hat (besonders wichtig bei Prüfungen).
|
||||||
|
* **Automatisches Löschkonzept**: Möglichkeit zur Einhaltung von Löschfristen erfasster Daten nach Beendigung des Arbeitsverhältnisses.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## ✉️ 8. E-Mail-Verifizierung & Inhouse-Mailserver
|
||||||
|
* **Sicherer Registrierungs-Flow**: E-Mail-Verifizierung bei Neuregistrierung mittels eines 6-stelligen, zeitlich begrenzten Bestätigungscodes. Erst nach Eingabe des Codes wird das Benutzerkonto aktiviert und der Login erlaubt.
|
||||||
|
* **Inhouse SMTP-Lösungen**:
|
||||||
|
* **Lokale Entwicklung**: Einbindung eines SMTP-Sandboxes wie **Mailpit** (oder MailHog) direkt in die `docker-compose.yml`, um E-Mails sicher lokal zu fangen und im Browser zu sichten.
|
||||||
|
* **Produktion**: Konfiguration für inhouse SMTP-Relays oder Aufbau eines vollverschlüsselten **docker-mailserver** Containers für den komplett eigenständigen, datenschutzkonformen E-Mail-Versand.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 🏢 9. B2B-Fähigkeit & Azure AD (Entra ID) Integration
|
||||||
|
* **Generisches Single Sign-On (SSO)**: Integration von OpenID Connect (OIDC) über Umgebungsvariablen. Dadurch können Unternehmen das Tool nahtlos an Microsoft Entra ID (Azure AD), Okta, Keycloak oder Google Workspace anbinden.
|
||||||
|
* **White-Labeling & Customizing (Single-Tenant)**: Möglichkeit, Firmenlogos, Firmennamen und Standardeinstellungen (z.B. Feiertags-Bundesland) pro Docker-Compose-Instanz flexibel anzupassen.
|
||||||
|
* **Optionale SaaS-Erweiterung (Multi-Tenant)**: Zukünftiger Ausbau für mehrmandantenfähigen Betrieb mit Datenisolation auf Tabellenebene (`TenantId`), dynamischer SSO-Zuordnung per E-Mail-Domain und zentraler Rechnungsabwicklung (z.B. Stripe).
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 💬 10. Gamifizierter Assistent & KI-Chatbot
|
||||||
|
* **Regelbasierter Gamification-Widget (Quick-Win)**: Ein kleiner, charismatischer Assistent/Avatar im UI, der basierend auf den aktuellen Arbeitsstatistiken motivierende, freche oder informative Sprüche anzeigt (z.B. bei vielen Überstunden, fehlenden Pausen oder anstehendem Urlaub).
|
||||||
|
* **LLM-gestützter KI-Assistent (Smart-Assistant)**:
|
||||||
|
* **Analysen**: Ein Chat-Fenster, in dem der Benutzer Fragen zu seinen Arbeitszeiten stellen kann (z.B. *"Wie viele Überstunden habe ich diesen Monat angesammelt?"* oder *"Wann habe ich letzte Woche Dienstag angefangen?"*).
|
||||||
|
* **Interaktion & Aktionen**: Die KI kann durch Function Calling direkt Aktionen ausführen (z.B. *"Trage mir für morgen 8 Stunden Arbeit ein"* oder *"Trage Urlaub für KW 28 ein"*).
|
||||||
|
* **Technologie**: Anbindung über ein einfaches HttpClient-Modul an die Google Gemini API, OpenAI oder lokal über ein Ollama-Docker-Container.
|
||||||
|
|
||||||
|
|
||||||
Executable
+16
@@ -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
|
||||||
BIN
Binary file not shown.
|
After Width: | Height: | Size: 61 KiB |
@@ -0,0 +1,297 @@
|
|||||||
|
@inject ITimetrackerService TrackerService
|
||||||
|
@inject AuthenticationStateProvider AuthStateProvider
|
||||||
|
@inject IJSRuntime JS
|
||||||
|
@using System.Security.Claims
|
||||||
|
@using timetracker.Shared
|
||||||
|
|
||||||
|
@if (_isOpen)
|
||||||
|
{
|
||||||
|
<div class="timebot-chat-window">
|
||||||
|
<!-- Chat Header -->
|
||||||
|
<div class="timebot-header">
|
||||||
|
<div class="timebot-header-info">
|
||||||
|
<img src="/timebot.png" class="timebot-header-avatar" alt="Timebot" />
|
||||||
|
<div class="timebot-header-text">
|
||||||
|
<span class="timebot-header-title">Timebot</span>
|
||||||
|
<span class="timebot-header-status"><span class="status-dot"></span> Online</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<button class="timebot-close-btn" @onclick="ToggleChat" aria-label="Schließen">
|
||||||
|
<MudIcon Icon="@Icons.Material.Filled.Close" Size="Size.Small" Style="color: white;" />
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Chat Body -->
|
||||||
|
<div class="timebot-body" id="timebot-body-el">
|
||||||
|
@foreach (var msg in _messages)
|
||||||
|
{
|
||||||
|
<div class="timebot-msg-row @(msg.Sender == "User" ? "user-row" : "bot-row")">
|
||||||
|
@if (msg.Sender == "Bot")
|
||||||
|
{
|
||||||
|
<img src="/timebot.png" class="timebot-msg-avatar" alt="Timebot" />
|
||||||
|
}
|
||||||
|
<div class="timebot-msg-bubble @(msg.Sender == "User" ? "user-bubble" : "bot-bubble")">
|
||||||
|
@if (msg.IsTyping)
|
||||||
|
{
|
||||||
|
<div class="typing-indicator">
|
||||||
|
<span></span><span></span><span></span>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
@((MarkupString)FormatMessageText(msg.Content))
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Suggestion Chips -->
|
||||||
|
<div class="timebot-suggestions">
|
||||||
|
<button @onclick="@(() => AskQuestion("Überstunden"))">📊 Überstunden</button>
|
||||||
|
<button @onclick="@(() => AskQuestion("Woche"))">⏱️ Wochenarbeitszeit</button>
|
||||||
|
<button @onclick="@(() => AskQuestion("Urlaub"))">🏖️ Urlaubs-Maximizer</button>
|
||||||
|
<button @onclick="@(() => AskQuestion("Hilfe"))">💡 Hilfe</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Chat Footer -->
|
||||||
|
<div class="timebot-footer">
|
||||||
|
<input type="text" @bind="_userInput" @bind:event="oninput" @onkeypress="HandleKeyPress" placeholder="Schreibe eine Nachricht..." class="timebot-input" />
|
||||||
|
<button class="timebot-send-btn" @onclick="SendMessage" disabled="@(string.IsNullOrWhiteSpace(_userInput))">
|
||||||
|
<MudIcon Icon="@Icons.Material.Filled.Send" Style="color: #3F51B5;" />
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
|
||||||
|
<!-- Floating Button -->
|
||||||
|
<div class="timebot-launcher @(_isOpen ? "open" : "")" @onclick="ToggleChat">
|
||||||
|
<img src="/timebot.png" alt="Timebot Launcher" />
|
||||||
|
@if (_unreadCount > 0 && !_isOpen)
|
||||||
|
{
|
||||||
|
<span class="timebot-badge">@_unreadCount</span>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
@code {
|
||||||
|
private bool _isOpen = false;
|
||||||
|
private string _userInput = "";
|
||||||
|
private int _unreadCount = 1;
|
||||||
|
private List<ChatMessage> _messages = new();
|
||||||
|
|
||||||
|
private int _userId;
|
||||||
|
private string _username = "Marc";
|
||||||
|
private AppSettings _settings = new();
|
||||||
|
|
||||||
|
protected override async Task OnInitializedAsync()
|
||||||
|
{
|
||||||
|
var authState = await AuthStateProvider.GetAuthenticationStateAsync();
|
||||||
|
var claim = authState.User.FindFirst(ClaimTypes.NameIdentifier);
|
||||||
|
if (claim != null)
|
||||||
|
{
|
||||||
|
_userId = int.Parse(claim.Value);
|
||||||
|
_username = authState.User.Identity?.Name ?? "Marc";
|
||||||
|
if (!string.IsNullOrEmpty(_username))
|
||||||
|
{
|
||||||
|
_username = char.ToUpper(_username[0]) + _username.Substring(1);
|
||||||
|
}
|
||||||
|
_settings = await TrackerService.GetSettingsAsync(_userId);
|
||||||
|
}
|
||||||
|
|
||||||
|
_messages.Add(new ChatMessage
|
||||||
|
{
|
||||||
|
Sender = "Bot",
|
||||||
|
Content = $"Hallo {_username}! 👋 Ich bin dein Timebot. Ich habe ein Auge auf deine Zeiten geworfen.\n\nWie kann ich dir heute helfen?",
|
||||||
|
Timestamp = DateTime.Now
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private void ToggleChat()
|
||||||
|
{
|
||||||
|
_isOpen = !_isOpen;
|
||||||
|
if (_isOpen)
|
||||||
|
{
|
||||||
|
_unreadCount = 0;
|
||||||
|
_ = ScrollToBottom();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task HandleKeyPress(KeyboardEventArgs e)
|
||||||
|
{
|
||||||
|
if (e.Key == "Enter" && !string.IsNullOrWhiteSpace(_userInput))
|
||||||
|
{
|
||||||
|
await SendMessage();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task SendMessage()
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(_userInput)) return;
|
||||||
|
var text = _userInput;
|
||||||
|
_userInput = "";
|
||||||
|
|
||||||
|
_messages.Add(new ChatMessage { Sender = "User", Content = text, Timestamp = DateTime.Now });
|
||||||
|
await ScrollToBottom();
|
||||||
|
|
||||||
|
await RespondTo(text);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task AskQuestion(string key)
|
||||||
|
{
|
||||||
|
string userQuestion = "";
|
||||||
|
if (key == "Überstunden") userQuestion = "Wie viele Überstunden habe ich?";
|
||||||
|
else if (key == "Woche") userQuestion = "Wie sieht meine Woche aus?";
|
||||||
|
else if (key == "Urlaub") userQuestion = "Wie hilft mir der Urlaubs-Maximizer?";
|
||||||
|
else if (key == "Hilfe") userQuestion = "Welche Fragen kann ich dir stellen?";
|
||||||
|
|
||||||
|
_messages.Add(new ChatMessage { Sender = "User", Content = userQuestion, Timestamp = DateTime.Now });
|
||||||
|
await ScrollToBottom();
|
||||||
|
|
||||||
|
await RespondTo(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task RespondTo(string query)
|
||||||
|
{
|
||||||
|
// Add typing indicator
|
||||||
|
var typingMsg = new ChatMessage { Sender = "Bot", IsTyping = true, Timestamp = DateTime.Now };
|
||||||
|
_messages.Add(typingMsg);
|
||||||
|
await ScrollToBottom();
|
||||||
|
|
||||||
|
// Simulate thinking/typing delay
|
||||||
|
await Task.Delay(1000);
|
||||||
|
_messages.Remove(typingMsg);
|
||||||
|
|
||||||
|
string responseText = "";
|
||||||
|
var normalized = query.ToLower();
|
||||||
|
|
||||||
|
if (normalized.Contains("überstunden") || normalized == "überstunden" || normalized.Contains("saldo") || normalized.Contains("gleitzeit"))
|
||||||
|
{
|
||||||
|
var settings = await TrackerService.GetSettingsAsync(_userId);
|
||||||
|
var overtime = await TrackerService.GetTotalOvertimeAsync(_userId, settings);
|
||||||
|
var overtimeStr = FormatTs(overtime, sign: true);
|
||||||
|
|
||||||
|
if (overtime >= TimeSpan.Zero)
|
||||||
|
{
|
||||||
|
responseText = $"Dein Gleitzeitkonto sieht super aus! Du hast aktuell **{overtimeStr} Std.** auf deinem Gleitzeitkonto angesammelt.\n\nSehr stark! Hast du mit der Extrazeit schon etwas vor oder bist du einfach nur voll am Hustlen? 🚀🔥";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
responseText = $"Dein Gleitzeitkonto steht aktuell bei **{overtimeStr} Std.**\n\nDu bist also ein kleines bisschen im Minus. Aber kein Grund zur Sorge: Das lässt sich mit ein paar Extra-Minuten in den nächsten Tagen leicht wieder ausgleichen! 💪";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (normalized.Contains("woche") || normalized == "woche" || normalized.Contains("arbeitszeit") || normalized.Contains("stunden"))
|
||||||
|
{
|
||||||
|
var today = DateOnly.FromDateTime(DateTime.Today);
|
||||||
|
var monday = GetMonday(today);
|
||||||
|
var settings = await TrackerService.GetSettingsAsync(_userId);
|
||||||
|
var weekDays = await TrackerService.GetWeekAsync(_userId, monday);
|
||||||
|
|
||||||
|
double workedHours = 0;
|
||||||
|
double targetHours = 0;
|
||||||
|
|
||||||
|
foreach (var date in Enumerable.Range(0, 7).Select(i => monday.AddDays(i)))
|
||||||
|
{
|
||||||
|
bool isWorkDay = settings.IsWorkDay(date.DayOfWeek);
|
||||||
|
if (isWorkDay)
|
||||||
|
{
|
||||||
|
targetHours += settings.DailyTargetHours;
|
||||||
|
}
|
||||||
|
|
||||||
|
var wd = weekDays.FirstOrDefault(d => d.Date == date);
|
||||||
|
if (wd != null && wd.StartTime != null && wd.EndTime != null)
|
||||||
|
{
|
||||||
|
var gross = wd.EndTime.Value.ToTimeSpan() - wd.StartTime.Value.ToTimeSpan();
|
||||||
|
if (gross > TimeSpan.Zero)
|
||||||
|
{
|
||||||
|
var breakTotal = wd.Breaks
|
||||||
|
.Where(b => b.StartTime.HasValue && b.EndTime.HasValue && b.EndTime > b.StartTime)
|
||||||
|
.Aggregate(TimeSpan.Zero, (s, b) =>
|
||||||
|
s + (b.EndTime!.Value.ToTimeSpan() - b.StartTime!.Value.ToTimeSpan()));
|
||||||
|
workedHours += (gross - breakTotal).TotalHours;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var workedTs = TimeSpan.FromHours(workedHours);
|
||||||
|
var targetTs = TimeSpan.FromHours(targetHours);
|
||||||
|
var percent = targetHours > 0 ? (int)Math.Round(workedHours / targetHours * 100) : 0;
|
||||||
|
|
||||||
|
responseText = $"Diese Woche hast du bereits **{FormatTs(workedTs)}** von geplanten **{FormatTs(targetTs)}** gearbeitet.\n\nDu hast diese Woche also schon **{percent}%** deines Solls erfüllt. Weiter so! ⏰";
|
||||||
|
}
|
||||||
|
else if (normalized.Contains("urlaub") || normalized == "urlaub" || normalized.Contains("maximizer") || normalized.Contains("brückentag"))
|
||||||
|
{
|
||||||
|
responseText = $"Der **Urlaubs-Maximizer** analysiert das Kalenderjahr, gesetzliche Feiertage und Brückentage, um dir die besten Zeiträume für Urlaub vorzuschlagen.\n\nDu findest die Auswertung direkt in der Sidebar unter **'Urlaubs-Maximizer'**. So machst du aus wenigen Urlaubstagen maximale Freizeit! 🏖️✈️";
|
||||||
|
}
|
||||||
|
else if (normalized.Contains("hilfe") || normalized == "hilfe" || normalized.Contains("hallo") || normalized.Contains("hi") || normalized.Contains("helo") || normalized.Contains("huhu") || normalized == "hilfe")
|
||||||
|
{
|
||||||
|
responseText = $"Ich kann dir Auskunft über deine Zeiten geben. Frage mich zum Beispiel:\n\n" +
|
||||||
|
$"• *'Wie viele Überstunden habe ich?'*\n" +
|
||||||
|
$"• *'Wie sieht meine Woche aus?'*\n" +
|
||||||
|
$"• *'Was macht der Urlaubs-Maximizer?'*\n\n" +
|
||||||
|
$"Oder tippe einfach deine Frage ein! 💡";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
responseText = $"Entschuldige, diese Frage kann ich leider noch nicht beantworten. 🤖\n\nFrage mich gerne nach deinem **Überstunden-Saldo**, deiner **Wochen-Arbeitszeit** oder dem **Urlaubs-Maximizer**!";
|
||||||
|
}
|
||||||
|
|
||||||
|
_messages.Add(new ChatMessage { Sender = "Bot", Content = responseText, Timestamp = DateTime.Now });
|
||||||
|
await ScrollToBottom();
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task ScrollToBottom()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await JS.InvokeVoidAsync("eval", "setTimeout(() => { const el = document.getElementById('timebot-body-el'); if(el) el.scrollTop = el.scrollHeight; }, 50);");
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
// Prerender-Pass ignorieren
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private string FormatMessageText(string text)
|
||||||
|
{
|
||||||
|
// Simple helper to replace markdown bold (**text**) with HTML bold (<strong>text</strong>)
|
||||||
|
// and newlines (\n) with <br />
|
||||||
|
if (string.IsNullOrEmpty(text)) return "";
|
||||||
|
|
||||||
|
var formatted = text;
|
||||||
|
|
||||||
|
// Escape HTML first to prevent XSS
|
||||||
|
formatted = System.Net.WebUtility.HtmlEncode(formatted);
|
||||||
|
|
||||||
|
// Replace back escaped ** formatting
|
||||||
|
// Simple regex replace for **text**
|
||||||
|
var regex = new System.Text.RegularExpressions.Regex(@"\*\*(.*?)\*\*");
|
||||||
|
formatted = regex.Replace(formatted, "<strong>$1</strong>");
|
||||||
|
|
||||||
|
// Replace newlines
|
||||||
|
formatted = formatted.Replace("\n", "<br />");
|
||||||
|
|
||||||
|
return formatted;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static DateOnly GetMonday(DateOnly date)
|
||||||
|
{
|
||||||
|
int diff = ((int)date.DayOfWeek - (int)DayOfWeek.Monday + 7) % 7;
|
||||||
|
return date.AddDays(-diff);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string FormatTs(TimeSpan ts, bool sign = false)
|
||||||
|
{
|
||||||
|
if (ts == TimeSpan.Zero && sign) return "±0:00";
|
||||||
|
var prefix = sign ? (ts >= TimeSpan.Zero ? "+" : "−") : (ts < TimeSpan.Zero ? "−" : "");
|
||||||
|
var abs = ts.Duration();
|
||||||
|
return $"{prefix}{(int)abs.TotalHours}:{abs.Minutes:D2}";
|
||||||
|
}
|
||||||
|
|
||||||
|
private sealed class ChatMessage
|
||||||
|
{
|
||||||
|
public string Sender { get; set; } = "Bot";
|
||||||
|
public string Content { get; set; } = "";
|
||||||
|
public DateTime Timestamp { get; set; } = DateTime.Now;
|
||||||
|
public bool IsTyping { get; set; } = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,334 @@
|
|||||||
|
/* Floating Launcher Button */
|
||||||
|
.timebot-launcher {
|
||||||
|
position: fixed;
|
||||||
|
bottom: 24px;
|
||||||
|
right: 24px;
|
||||||
|
width: 64px;
|
||||||
|
height: 64px;
|
||||||
|
border-radius: 50%;
|
||||||
|
background: linear-gradient(135deg, #ffffff 0%, #f1f3f9 100%);
|
||||||
|
box-shadow: 0 8px 24px rgba(0, 0, 0, 0.2);
|
||||||
|
cursor: pointer;
|
||||||
|
z-index: 10000;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
transition: all 0.3s cubic-bezier(0.175, 0.885, 0.32, 1.275);
|
||||||
|
border: 2px solid #0EA5E9;
|
||||||
|
}
|
||||||
|
|
||||||
|
.timebot-launcher:hover {
|
||||||
|
transform: scale(1.1) translateY(-4px);
|
||||||
|
box-shadow: 0 12px 28px rgba(14, 165, 233, 0.4);
|
||||||
|
border-color: #0284C7;
|
||||||
|
}
|
||||||
|
|
||||||
|
.timebot-launcher img {
|
||||||
|
width: 48px;
|
||||||
|
height: 48px;
|
||||||
|
object-fit: contain;
|
||||||
|
}
|
||||||
|
|
||||||
|
.timebot-launcher.open {
|
||||||
|
transform: scale(0.9) rotate(90deg);
|
||||||
|
opacity: 0.8;
|
||||||
|
}
|
||||||
|
|
||||||
|
.timebot-badge {
|
||||||
|
position: absolute;
|
||||||
|
top: -4px;
|
||||||
|
right: -4px;
|
||||||
|
background-color: #ff3b30;
|
||||||
|
color: white;
|
||||||
|
font-size: 11px;
|
||||||
|
font-weight: bold;
|
||||||
|
padding: 3px 7px;
|
||||||
|
border-radius: 10px;
|
||||||
|
border: 2px solid white;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Chat Window */
|
||||||
|
.timebot-chat-window {
|
||||||
|
position: fixed;
|
||||||
|
bottom: 100px;
|
||||||
|
right: 24px;
|
||||||
|
width: 360px;
|
||||||
|
height: 520px;
|
||||||
|
max-height: 80vh;
|
||||||
|
border-radius: 20px;
|
||||||
|
background: rgba(32, 33, 36, 0.95);
|
||||||
|
backdrop-filter: blur(16px);
|
||||||
|
-webkit-backdrop-filter: blur(16px);
|
||||||
|
border: 1px solid rgba(255, 255, 255, 0.1);
|
||||||
|
box-shadow: 0 12px 40px rgba(0, 0, 0, 0.5);
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
overflow: hidden;
|
||||||
|
z-index: 9999;
|
||||||
|
animation: slideUp 0.4s cubic-bezier(0.16, 1, 0.3, 1) forwards;
|
||||||
|
color: #f1f3f9;
|
||||||
|
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes slideUp {
|
||||||
|
from {
|
||||||
|
opacity: 0;
|
||||||
|
transform: translateY(30px) scale(0.95);
|
||||||
|
}
|
||||||
|
to {
|
||||||
|
opacity: 1;
|
||||||
|
transform: translateY(0) scale(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Header */
|
||||||
|
.timebot-header {
|
||||||
|
background: #0F172A;
|
||||||
|
padding: 14px 16px;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
border-bottom: 1px solid rgba(255, 255, 255, 0.08);
|
||||||
|
}
|
||||||
|
|
||||||
|
.timebot-header-info {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.timebot-header-avatar {
|
||||||
|
width: 36px;
|
||||||
|
height: 36px;
|
||||||
|
background: rgba(255, 255, 255, 0.15);
|
||||||
|
border-radius: 50%;
|
||||||
|
padding: 2px;
|
||||||
|
object-fit: contain;
|
||||||
|
}
|
||||||
|
|
||||||
|
.timebot-header-text {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
}
|
||||||
|
|
||||||
|
.timebot-header-title {
|
||||||
|
font-weight: 700;
|
||||||
|
font-size: 15px;
|
||||||
|
color: white;
|
||||||
|
letter-spacing: 0.3px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.timebot-header-status {
|
||||||
|
font-size: 11px;
|
||||||
|
color: rgba(255, 255, 255, 0.75);
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.status-dot {
|
||||||
|
width: 6px;
|
||||||
|
height: 6px;
|
||||||
|
background-color: #4cd964;
|
||||||
|
border-radius: 50%;
|
||||||
|
display: inline-block;
|
||||||
|
box-shadow: 0 0 8px #4cd964;
|
||||||
|
animation: pulse 2s infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes pulse {
|
||||||
|
0% { transform: scale(0.95); box-shadow: 0 0 0 0 rgba(76, 217, 100, 0.7); }
|
||||||
|
70% { transform: scale(1); box-shadow: 0 0 0 6px rgba(76, 217, 100, 0); }
|
||||||
|
100% { transform: scale(0.95); box-shadow: 0 0 0 0 rgba(76, 217, 100, 0); }
|
||||||
|
}
|
||||||
|
|
||||||
|
.timebot-close-btn {
|
||||||
|
background: transparent;
|
||||||
|
border: none;
|
||||||
|
cursor: pointer;
|
||||||
|
opacity: 0.8;
|
||||||
|
transition: opacity 0.2s;
|
||||||
|
padding: 4px;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.timebot-close-btn:hover {
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Chat Body */
|
||||||
|
.timebot-body {
|
||||||
|
flex: 1;
|
||||||
|
padding: 16px;
|
||||||
|
overflow-y: auto;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 12px;
|
||||||
|
background: rgba(24, 25, 28, 0.4);
|
||||||
|
}
|
||||||
|
|
||||||
|
.timebot-msg-row {
|
||||||
|
display: flex;
|
||||||
|
gap: 8px;
|
||||||
|
max-width: 85%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.timebot-msg-row.bot-row {
|
||||||
|
align-self: flex-start;
|
||||||
|
}
|
||||||
|
|
||||||
|
.timebot-msg-row.user-row {
|
||||||
|
align-self: flex-end;
|
||||||
|
flex-direction: row-reverse;
|
||||||
|
}
|
||||||
|
|
||||||
|
.timebot-msg-avatar {
|
||||||
|
width: 28px;
|
||||||
|
height: 28px;
|
||||||
|
background: rgba(255, 255, 255, 0.1);
|
||||||
|
border-radius: 50%;
|
||||||
|
padding: 2px;
|
||||||
|
align-self: flex-end;
|
||||||
|
object-fit: contain;
|
||||||
|
}
|
||||||
|
|
||||||
|
.timebot-msg-bubble {
|
||||||
|
padding: 10px 14px;
|
||||||
|
border-radius: 16px;
|
||||||
|
font-size: 13.5px;
|
||||||
|
line-height: 1.45;
|
||||||
|
white-space: pre-wrap;
|
||||||
|
word-break: break-word;
|
||||||
|
}
|
||||||
|
|
||||||
|
.bot-bubble {
|
||||||
|
background: rgba(255, 255, 255, 0.08);
|
||||||
|
color: #e3e3e7;
|
||||||
|
border-bottom-left-radius: 4px;
|
||||||
|
border: 1px solid rgba(255, 255, 255, 0.04);
|
||||||
|
}
|
||||||
|
|
||||||
|
.user-bubble {
|
||||||
|
background: linear-gradient(135deg, #0EA5E9 0%, #0284C7 100%);
|
||||||
|
color: white;
|
||||||
|
border-bottom-right-radius: 4px;
|
||||||
|
box-shadow: 0 4px 12px rgba(14, 165, 233, 0.2);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Typing Indicator */
|
||||||
|
.typing-indicator {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 4px;
|
||||||
|
padding: 4px 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.typing-indicator span {
|
||||||
|
width: 6px;
|
||||||
|
height: 6px;
|
||||||
|
background-color: #a8b2c1;
|
||||||
|
border-radius: 50%;
|
||||||
|
display: inline-block;
|
||||||
|
animation: bounce 1.4s infinite both;
|
||||||
|
}
|
||||||
|
|
||||||
|
.typing-indicator span:nth-child(1) { animation-delay: -0.32s; }
|
||||||
|
.typing-indicator span:nth-child(2) { animation-delay: -0.16s; }
|
||||||
|
|
||||||
|
@keyframes bounce {
|
||||||
|
0%, 80%, 100% { transform: scale(0); }
|
||||||
|
40% { transform: scale(1.0); }
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Suggestions */
|
||||||
|
.timebot-suggestions {
|
||||||
|
display: flex;
|
||||||
|
gap: 6px;
|
||||||
|
padding: 8px 12px;
|
||||||
|
background: rgba(18, 18, 20, 0.6);
|
||||||
|
border-top: 1px solid rgba(255, 255, 255, 0.06);
|
||||||
|
overflow-x: auto;
|
||||||
|
scrollbar-width: none; /* Scrollbar hidden for visual aesthetics */
|
||||||
|
}
|
||||||
|
|
||||||
|
.timebot-suggestions::-webkit-scrollbar {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.timebot-suggestions button {
|
||||||
|
flex-shrink: 0;
|
||||||
|
background: rgba(255, 255, 255, 0.06);
|
||||||
|
border: 1px solid rgba(255, 255, 255, 0.08);
|
||||||
|
color: #cbd5e1;
|
||||||
|
padding: 6px 12px;
|
||||||
|
border-radius: 14px;
|
||||||
|
font-size: 12px;
|
||||||
|
cursor: pointer;
|
||||||
|
transition: all 0.2s;
|
||||||
|
font-weight: 500;
|
||||||
|
}
|
||||||
|
|
||||||
|
.timebot-suggestions button:hover {
|
||||||
|
background: rgba(14, 165, 233, 0.15);
|
||||||
|
border-color: #0EA5E9;
|
||||||
|
color: white;
|
||||||
|
transform: translateY(-1px);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Footer */
|
||||||
|
.timebot-footer {
|
||||||
|
padding: 12px;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
background: rgba(32, 33, 36, 0.98);
|
||||||
|
border-top: 1px solid rgba(255, 255, 255, 0.06);
|
||||||
|
}
|
||||||
|
|
||||||
|
.timebot-input {
|
||||||
|
flex: 1;
|
||||||
|
background: rgba(255, 255, 255, 0.06);
|
||||||
|
border: 1px solid rgba(255, 255, 255, 0.08);
|
||||||
|
color: white;
|
||||||
|
padding: 10px 14px;
|
||||||
|
border-radius: 12px;
|
||||||
|
font-size: 13px;
|
||||||
|
outline: none;
|
||||||
|
transition: all 0.2s;
|
||||||
|
}
|
||||||
|
|
||||||
|
.timebot-input:focus {
|
||||||
|
border-color: #0EA5E9;
|
||||||
|
background: rgba(255, 255, 255, 0.1);
|
||||||
|
box-shadow: 0 0 0 2px rgba(14, 165, 233, 0.2);
|
||||||
|
}
|
||||||
|
|
||||||
|
.timebot-send-btn {
|
||||||
|
background: white;
|
||||||
|
border: none;
|
||||||
|
border-radius: 10px;
|
||||||
|
width: 36px;
|
||||||
|
height: 36px;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
cursor: pointer;
|
||||||
|
transition: all 0.2s;
|
||||||
|
}
|
||||||
|
|
||||||
|
.timebot-send-btn:hover {
|
||||||
|
background: #e0f2fe;
|
||||||
|
transform: scale(1.05);
|
||||||
|
}
|
||||||
|
|
||||||
|
.timebot-send-btn:disabled {
|
||||||
|
background: rgba(255, 255, 255, 0.04);
|
||||||
|
cursor: not-allowed;
|
||||||
|
transform: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.timebot-send-btn:disabled ::deep .mud-icon-root {
|
||||||
|
color: rgba(255, 255, 255, 0.2) !important;
|
||||||
|
}
|
||||||
@@ -0,0 +1,139 @@
|
|||||||
|
@inherits LayoutComponentBase
|
||||||
|
@inject AuthenticationStateProvider AuthStateProvider
|
||||||
|
@inject NavigationManager Nav
|
||||||
|
@inject IUserNotificationService UserNotificationService
|
||||||
|
@inject IJSRuntime JSRuntime
|
||||||
|
@implements IDisposable
|
||||||
|
@using System.Security.Claims
|
||||||
|
|
||||||
|
<MudThemeProvider Theme="_theme" @bind-IsDarkMode="_isDarkMode" />
|
||||||
|
<MudPopoverProvider />
|
||||||
|
<MudDialogProvider />
|
||||||
|
<MudSnackbarProvider />
|
||||||
|
|
||||||
|
<MudLayout>
|
||||||
|
<MudAppBar Elevation="0" Style="background: #0F172A; border-bottom: 1px solid rgba(255, 255, 255, 0.08);">
|
||||||
|
<AuthorizeView>
|
||||||
|
<Authorized>
|
||||||
|
<MudIconButton Icon="@Icons.Material.Filled.Menu" Color="Color.Inherit" Edge="Edge.Start" OnClick="ToggleDrawer" Class="d-flex d-md-none mr-2" />
|
||||||
|
</Authorized>
|
||||||
|
</AuthorizeView>
|
||||||
|
<MudSpacer />
|
||||||
|
<MudIconButton Icon="@(_isDarkMode ? Icons.Material.Filled.LightMode : Icons.Material.Filled.DarkMode)"
|
||||||
|
Color="Color.Inherit"
|
||||||
|
OnClick="ToggleDarkMode"
|
||||||
|
Class="mr-2" />
|
||||||
|
</MudAppBar>
|
||||||
|
|
||||||
|
<AuthorizeView>
|
||||||
|
<Authorized>
|
||||||
|
<MudDrawer @bind-Open="_drawerOpen" ClipMode="DrawerClipMode.Never" Elevation="0" Variant="DrawerVariant.Mini" OpenMiniOnHover="false" Class="modern-drawer">
|
||||||
|
<NavMenu OnToggleDrawer="ToggleDrawer" />
|
||||||
|
</MudDrawer>
|
||||||
|
</Authorized>
|
||||||
|
</AuthorizeView>
|
||||||
|
|
||||||
|
<MudMainContent>
|
||||||
|
<MudContainer MaxWidth="MaxWidth.Large" Class="mt-4 pb-8">
|
||||||
|
@Body
|
||||||
|
</MudContainer>
|
||||||
|
</MudMainContent>
|
||||||
|
|
||||||
|
<AuthorizeView>
|
||||||
|
<Authorized>
|
||||||
|
<ChatbotWidget />
|
||||||
|
</Authorized>
|
||||||
|
</AuthorizeView>
|
||||||
|
</MudLayout>
|
||||||
|
|
||||||
|
@code {
|
||||||
|
private bool _drawerOpen = true;
|
||||||
|
private bool _isDarkMode;
|
||||||
|
|
||||||
|
protected override void OnInitialized()
|
||||||
|
{
|
||||||
|
UserNotificationService.OnUserDeleted += HandleUserDeleted;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override async Task OnAfterRenderAsync(bool firstRender)
|
||||||
|
{
|
||||||
|
if (firstRender)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var saved = await JSRuntime.InvokeAsync<string>("localStorage.getItem", "darkMode");
|
||||||
|
if (!string.IsNullOrEmpty(saved))
|
||||||
|
{
|
||||||
|
_isDarkMode = bool.Parse(saved);
|
||||||
|
StateHasChanged();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
// Ignored during prerendering/SSR
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task ToggleDarkMode()
|
||||||
|
{
|
||||||
|
_isDarkMode = !_isDarkMode;
|
||||||
|
await JSRuntime.InvokeVoidAsync("localStorage.setItem", "darkMode", _isDarkMode.ToString().ToLower());
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task HandleUserDeleted(int deletedUserId)
|
||||||
|
{
|
||||||
|
var state = await AuthStateProvider.GetAuthenticationStateAsync();
|
||||||
|
var idClaim = state.User.FindFirst(ClaimTypes.NameIdentifier)?.Value;
|
||||||
|
if (idClaim != null && int.TryParse(idClaim, out var myId) && myId == deletedUserId)
|
||||||
|
{
|
||||||
|
await InvokeAsync(() => Nav.NavigateTo("/auth/logout", forceLoad: true));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Dispose()
|
||||||
|
{
|
||||||
|
UserNotificationService.OnUserDeleted -= HandleUserDeleted;
|
||||||
|
}
|
||||||
|
|
||||||
|
private readonly MudTheme _theme = new()
|
||||||
|
{
|
||||||
|
PaletteLight = new PaletteLight
|
||||||
|
{
|
||||||
|
Primary = "#1E293B",
|
||||||
|
PrimaryDarken = "#0F172A",
|
||||||
|
PrimaryLighten = "#475569",
|
||||||
|
Secondary = "#0EA5E9",
|
||||||
|
SecondaryDarken = "#0284C7",
|
||||||
|
AppbarBackground = "#0F172A",
|
||||||
|
Background = "#F8FAFC",
|
||||||
|
DrawerBackground = "#0F172A",
|
||||||
|
DrawerText = "#94A3B8",
|
||||||
|
DrawerIcon = "#94A3B8",
|
||||||
|
Surface = "#FFFFFF",
|
||||||
|
TextPrimary = "#0F172A",
|
||||||
|
TextSecondary = "#475569",
|
||||||
|
},
|
||||||
|
PaletteDark = new PaletteDark
|
||||||
|
{
|
||||||
|
Primary = "#0EA5E9",
|
||||||
|
PrimaryDarken = "#0284C7",
|
||||||
|
PrimaryLighten = "#38BDF8",
|
||||||
|
Secondary = "#0EA5E9",
|
||||||
|
SecondaryDarken = "#0284C7",
|
||||||
|
AppbarBackground = "#0F172A",
|
||||||
|
AppbarText = "#F8FAFC",
|
||||||
|
Background = "#0B0F19",
|
||||||
|
DrawerBackground = "#0F172A",
|
||||||
|
DrawerText = "#94A3B8",
|
||||||
|
DrawerIcon = "#94A3B8",
|
||||||
|
Surface = "#1E293B",
|
||||||
|
TextPrimary = "#F8FAFC",
|
||||||
|
TextSecondary = "#94A3B8",
|
||||||
|
ActionDefault = "#94A3B8",
|
||||||
|
Divider = "rgba(255, 255, 255, 0.08)",
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
private void ToggleDrawer() => _drawerOpen = !_drawerOpen;
|
||||||
|
}
|
||||||
@@ -0,0 +1,56 @@
|
|||||||
|
/* Custom scrollbar for the modern drawer */
|
||||||
|
::deep .modern-drawer .mud-drawer-content::-webkit-scrollbar {
|
||||||
|
width: 6px;
|
||||||
|
}
|
||||||
|
::deep .modern-drawer .mud-drawer-content::-webkit-scrollbar-track {
|
||||||
|
background: transparent;
|
||||||
|
}
|
||||||
|
::deep .modern-drawer .mud-drawer-content::-webkit-scrollbar-thumb {
|
||||||
|
background: rgba(255, 255, 255, 0.1);
|
||||||
|
border-radius: 3px;
|
||||||
|
}
|
||||||
|
::deep .modern-drawer .mud-drawer-content::-webkit-scrollbar-thumb:hover {
|
||||||
|
background: rgba(255, 255, 255, 0.2);
|
||||||
|
}
|
||||||
|
|
||||||
|
::deep .modern-drawer {
|
||||||
|
border-right: 1px solid rgba(255, 255, 255, 0.08) !important;
|
||||||
|
box-shadow: 4px 0 24px rgba(0, 0, 0, 0.1) !important;
|
||||||
|
transition: width 0.25s cubic-bezier(0.4, 0, 0.2, 1) !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Glassmorphism for the appbar */
|
||||||
|
::deep .mud-appbar {
|
||||||
|
background: rgba(15, 23, 42, 0.85) !important;
|
||||||
|
backdrop-filter: blur(12px) !important;
|
||||||
|
-webkit-backdrop-filter: blur(12px) !important;
|
||||||
|
border-bottom: 1px solid rgba(255, 255, 255, 0.08) !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Smooth transition in main layout content */
|
||||||
|
::deep .mud-main-content {
|
||||||
|
transition: padding-left 0.25s cubic-bezier(0.4, 0, 0.2, 1) !important;
|
||||||
|
background-color: #F8FAFC;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Blazor Error UI */
|
||||||
|
#blazor-error-ui {
|
||||||
|
color-scheme: light only;
|
||||||
|
background: lightyellow;
|
||||||
|
bottom: 0;
|
||||||
|
box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2);
|
||||||
|
box-sizing: border-box;
|
||||||
|
display: none;
|
||||||
|
left: 0;
|
||||||
|
padding: 0.6rem 1.25rem 0.7rem 1.25rem;
|
||||||
|
position: fixed;
|
||||||
|
width: 100%;
|
||||||
|
z-index: 1000;
|
||||||
|
}
|
||||||
|
|
||||||
|
#blazor-error-ui .dismiss {
|
||||||
|
cursor: pointer;
|
||||||
|
position: absolute;
|
||||||
|
right: 0.75rem;
|
||||||
|
top: 0.5rem;
|
||||||
|
}
|
||||||
@@ -0,0 +1,97 @@
|
|||||||
|
<div class="nav-container onboarding-nav-menu">
|
||||||
|
@* --- Brand / Logo Section --- *@
|
||||||
|
<div class="nav-header">
|
||||||
|
<div class="logo-wrapper">
|
||||||
|
<MudIconButton Icon="@Icons.Material.Filled.Menu" Color="Color.Inherit" OnClick="OnToggleDrawer" Class="drawer-toggle-btn mr-1" />
|
||||||
|
<MudIcon Icon="@Icons.Material.Filled.AccessTime" Class="logo-icon" />
|
||||||
|
<span class="brand-text">Timetracker</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
@* --- Navigation Links --- *@
|
||||||
|
<div class="nav-content">
|
||||||
|
<MudNavMenu Class="custom-nav-menu">
|
||||||
|
<MudTooltip Text="Wochenübersicht" Placement="Placement.Right">
|
||||||
|
<MudNavLink Href="" Match="NavLinkMatch.All" Icon="@Icons.Material.Filled.CalendarMonth" Class="custom-nav-link">Wochenübersicht</MudNavLink>
|
||||||
|
</MudTooltip>
|
||||||
|
<MudTooltip Text="Monatsübersicht" Placement="Placement.Right">
|
||||||
|
<MudNavLink Href="month" Icon="@Icons.Material.Filled.CalendarViewMonth" Class="custom-nav-link">Monatsübersicht</MudNavLink>
|
||||||
|
</MudTooltip>
|
||||||
|
<MudTooltip Text="Statistiken" Placement="Placement.Right">
|
||||||
|
<MudNavLink Href="stats" Icon="@Icons.Material.Filled.BarChart" Class="custom-nav-link">Statistiken</MudNavLink>
|
||||||
|
</MudTooltip>
|
||||||
|
<MudTooltip Text="Feiertage" Placement="Placement.Right">
|
||||||
|
<MudNavLink Href="feiertage" Icon="@Icons.Material.Filled.Celebration" Class="custom-nav-link">Feiertage</MudNavLink>
|
||||||
|
</MudTooltip>
|
||||||
|
<MudTooltip Text="Urlaubs-Maximizer" Placement="Placement.Right">
|
||||||
|
<MudNavLink Href="urlaub-maximizer" Icon="@Icons.Material.Filled.AutoAwesome" Class="custom-nav-link">Urlaubs-Maximizer</MudNavLink>
|
||||||
|
</MudTooltip>
|
||||||
|
<MudTooltip Text="Einstellungen" Placement="Placement.Right">
|
||||||
|
<MudNavLink Href="settings" Icon="@Icons.Material.Filled.Settings" Class="custom-nav-link">Einstellungen</MudNavLink>
|
||||||
|
</MudTooltip>
|
||||||
|
|
||||||
|
<AuthorizeView Policy="AdminOnly">
|
||||||
|
<Authorized>
|
||||||
|
<div class="admin-divider-container">
|
||||||
|
<span class="admin-divider-text">Admin</span>
|
||||||
|
<hr class="admin-divider-line" />
|
||||||
|
</div>
|
||||||
|
<MudTooltip Text="Benutzerverwaltung" Placement="Placement.Right">
|
||||||
|
<MudNavLink Href="admin/users" Icon="@Icons.Material.Filled.AdminPanelSettings" Class="custom-nav-link admin-link">
|
||||||
|
Benutzerverwaltung
|
||||||
|
</MudNavLink>
|
||||||
|
</MudTooltip>
|
||||||
|
</Authorized>
|
||||||
|
</AuthorizeView>
|
||||||
|
</MudNavMenu>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
@* --- Footer (User Profile & Action Info) --- *@
|
||||||
|
<div class="nav-footer">
|
||||||
|
<AuthorizeView>
|
||||||
|
<Authorized>
|
||||||
|
<div class="user-profile-card">
|
||||||
|
<div class="avatar-container">
|
||||||
|
<MudAvatar Class="user-avatar">
|
||||||
|
@GetInitials(context.User.Identity?.Name)
|
||||||
|
</MudAvatar>
|
||||||
|
<span class="status-dot"></span>
|
||||||
|
</div>
|
||||||
|
<div class="user-info">
|
||||||
|
<span class="user-name">@context.User.Identity?.Name</span>
|
||||||
|
<span class="user-status">Online</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</Authorized>
|
||||||
|
</AuthorizeView>
|
||||||
|
|
||||||
|
<MudNavMenu Class="footer-nav-menu">
|
||||||
|
<AuthorizeView>
|
||||||
|
<Authorized>
|
||||||
|
<MudTooltip Text="Abmelden" Placement="Placement.Right">
|
||||||
|
<MudNavLink Href="/auth/logout" Icon="@Icons.Material.Filled.Logout" Class="custom-nav-link logout-link">Abmelden</MudNavLink>
|
||||||
|
</MudTooltip>
|
||||||
|
</Authorized>
|
||||||
|
</AuthorizeView>
|
||||||
|
<MudTooltip Text="Changelog anzeigen" Placement="Placement.Right">
|
||||||
|
<MudNavLink Href="/changelog" Icon="@Icons.Material.Filled.NewReleases" Class="custom-nav-link version-link">
|
||||||
|
<span class="version-text">Version 1.4</span>
|
||||||
|
</MudNavLink>
|
||||||
|
</MudTooltip>
|
||||||
|
</MudNavMenu>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
@code {
|
||||||
|
[Parameter] public EventCallback OnToggleDrawer { get; set; }
|
||||||
|
|
||||||
|
private string GetInitials(string? name)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(name))
|
||||||
|
return "U";
|
||||||
|
var parts = name.Split(' ', StringSplitOptions.RemoveEmptyEntries);
|
||||||
|
if (parts.Length == 1)
|
||||||
|
return parts[0][..Math.Min(2, parts[0].Length)].ToUpper();
|
||||||
|
return $"{parts[0][0]}{parts[1][0]}".ToUpper();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,314 @@
|
|||||||
|
/* Base container covering full height */
|
||||||
|
.nav-container {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
height: 100%;
|
||||||
|
color: #94A3B8; /* Slate 400 */
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Ensure tooltips wrapper spans full width of menu */
|
||||||
|
::deep .mud-tooltip-root {
|
||||||
|
display: block !important;
|
||||||
|
width: 100% !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Header with logo and title */
|
||||||
|
.nav-header {
|
||||||
|
height: 64px;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
padding: 0 20px;
|
||||||
|
border-bottom: 1px solid rgba(255, 255, 255, 0.06);
|
||||||
|
margin-bottom: 8px;
|
||||||
|
box-sizing: border-box;
|
||||||
|
}
|
||||||
|
|
||||||
|
.logo-wrapper {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
width: 100%;
|
||||||
|
transition: all 0.25s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
::deep .drawer-toggle-btn {
|
||||||
|
color: #94A3B8 !important;
|
||||||
|
padding: 8px !important;
|
||||||
|
margin-left: -8px !important;
|
||||||
|
transition: all 0.2s ease !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
::deep .drawer-toggle-btn:hover {
|
||||||
|
color: #FFFFFF !important;
|
||||||
|
background-color: rgba(255, 255, 255, 0.05) !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
::deep .logo-icon {
|
||||||
|
color: #0EA5E9 !important; /* Sky 500 */
|
||||||
|
font-size: 1.6rem !important;
|
||||||
|
transition: opacity 0.2s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.brand-text {
|
||||||
|
font-size: 1.1rem;
|
||||||
|
font-weight: 800;
|
||||||
|
color: #FFFFFF;
|
||||||
|
letter-spacing: 0.5px;
|
||||||
|
white-space: nowrap;
|
||||||
|
opacity: 1;
|
||||||
|
transition: opacity 0.2s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Navigation scrollable content */
|
||||||
|
.nav-content {
|
||||||
|
flex: 1;
|
||||||
|
overflow-y: auto;
|
||||||
|
overflow-x: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Divider inside navigation list */
|
||||||
|
.admin-divider-container {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
padding: 16px 20px 8px 20px;
|
||||||
|
box-sizing: border-box;
|
||||||
|
transition: padding 0.25s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-divider-text {
|
||||||
|
font-size: 0.65rem;
|
||||||
|
font-weight: 700;
|
||||||
|
text-transform: uppercase;
|
||||||
|
letter-spacing: 1.5px;
|
||||||
|
color: #475569; /* Slate 600 */
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.admin-divider-line {
|
||||||
|
flex: 1;
|
||||||
|
border: none;
|
||||||
|
border-top: 1px solid rgba(255, 255, 255, 0.06);
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Standard NavLink customization */
|
||||||
|
::deep .custom-nav-link {
|
||||||
|
margin: 4px 12px !important;
|
||||||
|
border-radius: 12px !important;
|
||||||
|
transition: all 0.2s cubic-bezier(0.4, 0, 0.2, 1) !important;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Normal (inactive) text and icon colors */
|
||||||
|
::deep .custom-nav-link,
|
||||||
|
::deep .custom-nav-link .mud-nav-link-text,
|
||||||
|
::deep .custom-nav-link .mud-nav-link-icon-default {
|
||||||
|
color: #94A3B8 !important; /* Slate 400 */
|
||||||
|
}
|
||||||
|
|
||||||
|
/* NavLink hover */
|
||||||
|
::deep .custom-nav-link:hover {
|
||||||
|
background-color: rgba(255, 255, 255, 0.05) !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
::deep .custom-nav-link:hover,
|
||||||
|
::deep .custom-nav-link:hover .mud-nav-link-text,
|
||||||
|
::deep .custom-nav-link:hover .mud-nav-link-icon-default {
|
||||||
|
color: #F8FAFC !important; /* Slate 50 */
|
||||||
|
}
|
||||||
|
|
||||||
|
/* NavLink active state (Fixes active color contrast issue) */
|
||||||
|
::deep .custom-nav-link.active,
|
||||||
|
::deep .custom-nav-link .active {
|
||||||
|
background: linear-gradient(90deg, rgba(14, 165, 233, 0.15) 0%, rgba(14, 165, 233, 0.04) 100%) !important;
|
||||||
|
font-weight: 600 !important;
|
||||||
|
box-shadow: inset 3px 0 0 #0EA5E9 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
::deep .custom-nav-link.active,
|
||||||
|
::deep .custom-nav-link .active,
|
||||||
|
::deep .custom-nav-link.active .mud-nav-link-text,
|
||||||
|
::deep .custom-nav-link .active .mud-nav-link-text,
|
||||||
|
::deep .custom-nav-link.active .mud-nav-link-icon-default,
|
||||||
|
::deep .custom-nav-link .active .mud-nav-link-icon-default {
|
||||||
|
color: #0EA5E9 !important; /* Sky 500 */
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Admin link color overrides & active state */
|
||||||
|
::deep .admin-link .mud-nav-link-icon-default {
|
||||||
|
color: rgba(239, 68, 68, 0.7) !important; /* Red 500 */
|
||||||
|
}
|
||||||
|
|
||||||
|
::deep .admin-link.active,
|
||||||
|
::deep .admin-link .active {
|
||||||
|
background: linear-gradient(90deg, rgba(239, 68, 68, 0.15) 0%, rgba(239, 68, 68, 0.04) 100%) !important;
|
||||||
|
box-shadow: inset 3px 0 0 #EF4444 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
::deep .admin-link.active,
|
||||||
|
::deep .admin-link .active,
|
||||||
|
::deep .admin-link.active .mud-nav-link-text,
|
||||||
|
::deep .admin-link .active .mud-nav-link-text,
|
||||||
|
::deep .admin-link.active .mud-nav-link-icon-default,
|
||||||
|
::deep .admin-link .active .mud-nav-link-icon-default {
|
||||||
|
color: #EF4444 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Version link active state */
|
||||||
|
::deep .version-link.active,
|
||||||
|
::deep .version-link .active {
|
||||||
|
opacity: 1 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
::deep .version-link.active .version-text,
|
||||||
|
::deep .version-link .active .version-text {
|
||||||
|
color: #0EA5E9 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/* Footer Section */
|
||||||
|
.nav-footer {
|
||||||
|
border-top: 1px solid rgba(255, 255, 255, 0.06);
|
||||||
|
padding: 12px 0;
|
||||||
|
box-sizing: border-box;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
background: rgba(15, 23, 42, 0.2);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* User profile card */
|
||||||
|
.user-profile-card {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 12px;
|
||||||
|
padding: 8px 20px;
|
||||||
|
margin-bottom: 8px;
|
||||||
|
box-sizing: border-box;
|
||||||
|
transition: all 0.25s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.avatar-container {
|
||||||
|
position: relative;
|
||||||
|
display: inline-flex;
|
||||||
|
}
|
||||||
|
|
||||||
|
::deep .user-avatar {
|
||||||
|
width: 36px !important;
|
||||||
|
height: 36px !important;
|
||||||
|
background: linear-gradient(135deg, #0EA5E9 0%, #0284C7 100%) !important;
|
||||||
|
color: #FFFFFF !important;
|
||||||
|
font-weight: 700 !important;
|
||||||
|
font-size: 0.875rem !important;
|
||||||
|
border: 2px solid rgba(255, 255, 255, 0.1) !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.status-dot {
|
||||||
|
position: absolute;
|
||||||
|
bottom: -1px;
|
||||||
|
right: -1px;
|
||||||
|
width: 10px;
|
||||||
|
height: 10px;
|
||||||
|
background-color: #10B981; /* Emerald 500 */
|
||||||
|
border: 2px solid #0F172A;
|
||||||
|
border-radius: 50%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.user-info {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
overflow: hidden;
|
||||||
|
transition: opacity 0.15s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.user-name {
|
||||||
|
font-size: 0.85rem;
|
||||||
|
font-weight: 600;
|
||||||
|
color: #FFFFFF;
|
||||||
|
white-space: nowrap;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.user-status {
|
||||||
|
font-size: 0.7rem;
|
||||||
|
color: #10B981;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Special links in footer */
|
||||||
|
::deep .logout-link .mud-nav-link-icon-default {
|
||||||
|
color: rgba(148, 163, 184, 0.6) !important;
|
||||||
|
}
|
||||||
|
::deep .logout-link:hover .mud-nav-link-icon-default {
|
||||||
|
color: #EF4444 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
::deep .version-link {
|
||||||
|
opacity: 0.7;
|
||||||
|
}
|
||||||
|
::deep .version-link .mud-nav-link-text {
|
||||||
|
font-size: 0.75rem !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* --- COLLAPSED DRAWER (MINI STATE) STYLES --- */
|
||||||
|
|
||||||
|
/* Parent matches the mini drawer element (Note the correct Blazor CSS isolation placement) */
|
||||||
|
.mud-drawer--closed ::deep .logo-icon,
|
||||||
|
.mud-drawer--closed ::deep .brand-text {
|
||||||
|
display: none !important;
|
||||||
|
opacity: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mud-drawer--closed ::deep .logo-wrapper {
|
||||||
|
justify-content: center !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mud-drawer--closed ::deep .drawer-toggle-btn {
|
||||||
|
margin-left: 0 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mud-drawer--closed ::deep .admin-divider-container {
|
||||||
|
padding: 16px 0 8px 0 !important;
|
||||||
|
justify-content: center !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mud-drawer--closed ::deep .admin-divider-text {
|
||||||
|
display: none !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mud-drawer--closed ::deep .admin-divider-line {
|
||||||
|
width: 24px !important;
|
||||||
|
flex: none !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mud-drawer--closed ::deep .user-profile-card {
|
||||||
|
justify-content: center !important;
|
||||||
|
padding: 8px 0 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mud-drawer--closed ::deep .user-info {
|
||||||
|
display: none !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mud-drawer--closed ::deep .version-text {
|
||||||
|
display: none !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Ensure link text is hidden in mini mode to prevent clunky clipping */
|
||||||
|
.mud-drawer--closed ::deep .custom-nav-link .mud-nav-link-text {
|
||||||
|
display: none !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Center link icons when mini and adjust spacing */
|
||||||
|
.mud-drawer--closed ::deep .custom-nav-link {
|
||||||
|
margin: 4px 6px !important;
|
||||||
|
padding: 8px 0 !important;
|
||||||
|
justify-content: center !important;
|
||||||
|
min-height: 40px !important;
|
||||||
|
display: flex !important;
|
||||||
|
align-items: center !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mud-drawer--closed ::deep .custom-nav-link .mud-nav-link-icon-default {
|
||||||
|
margin-right: 0 !important;
|
||||||
|
}
|
||||||
+4
-4
@@ -1,10 +1,10 @@
|
|||||||
@page "/admin/users"
|
@page "/admin/users"
|
||||||
@rendermode InteractiveServer
|
@rendermode InteractiveWebAssembly
|
||||||
@attribute [Authorize(Policy = "AdminOnly")]
|
@attribute [Authorize(Policy = "AdminOnly")]
|
||||||
@inject AuthService AuthService
|
@inject IAuthService AuthService
|
||||||
@inject ISnackbar Snackbar
|
@inject ISnackbar Snackbar
|
||||||
@inject AuthenticationStateProvider AuthStateProvider
|
@inject AuthenticationStateProvider AuthStateProvider
|
||||||
@inject timetracker.Data.UserNotificationService UserNotificationService
|
@inject IUserNotificationService UserNotificationService
|
||||||
@implements IDisposable
|
@implements IDisposable
|
||||||
|
|
||||||
<PageTitle>Benutzerverwaltung – Timetracker</PageTitle>
|
<PageTitle>Benutzerverwaltung – Timetracker</PageTitle>
|
||||||
@@ -22,7 +22,7 @@ else
|
|||||||
|
|
||||||
@* ── Header ── *@
|
@* ── Header ── *@
|
||||||
<MudPaper Elevation="4" Class="pa-5 rounded-xl"
|
<MudPaper Elevation="4" Class="pa-5 rounded-xl"
|
||||||
Style="background: linear-gradient(135deg, #B71C1C 0%, #7F0000 100%); color:white;">
|
Style="background: #991B1B; color:white;">
|
||||||
<MudStack Row="true" AlignItems="AlignItems.Center" Spacing="3">
|
<MudStack Row="true" AlignItems="AlignItems.Center" Spacing="3">
|
||||||
<MudIcon Icon="@Icons.Material.Filled.AdminPanelSettings" Style="color:white; font-size:2rem" />
|
<MudIcon Icon="@Icons.Material.Filled.AdminPanelSettings" Style="color:white; font-size:2rem" />
|
||||||
<MudStack Spacing="0">
|
<MudStack Spacing="0">
|
||||||
@@ -0,0 +1,139 @@
|
|||||||
|
@page "/agb"
|
||||||
|
@rendermode InteractiveWebAssembly
|
||||||
|
@attribute [AllowAnonymous]
|
||||||
|
|
||||||
|
<PageTitle>AGB – Timetracker</PageTitle>
|
||||||
|
|
||||||
|
<MudContainer MaxWidth="MaxWidth.Medium" Class="mt-8 pb-8">
|
||||||
|
<MudStack Spacing="4">
|
||||||
|
|
||||||
|
@* ── Header ── *@
|
||||||
|
<MudPaper Elevation="4" Class="pa-5 rounded-xl" Style="background: #1E293B; color: white;">
|
||||||
|
<MudStack Row="true" AlignItems="AlignItems.Center" Spacing="3">
|
||||||
|
<MudIcon Icon="@Icons.Material.Filled.Gavel" Style="color: white; font-size: 2.2rem;" />
|
||||||
|
<MudStack Spacing="0">
|
||||||
|
<MudText Typo="Typo.h5" Style="color: white; font-weight: 700;">Allgemeine Geschäftsbedingungen (AGB)</MudText>
|
||||||
|
<MudText Typo="Typo.caption" Style="color: rgba(255,255,255,0.72);">
|
||||||
|
Rechtlich absolut unverbindliches Kauderwelsch und Flachwitze
|
||||||
|
</MudText>
|
||||||
|
</MudStack>
|
||||||
|
</MudStack>
|
||||||
|
</MudPaper>
|
||||||
|
|
||||||
|
@* ── Paragraphs with Flachwitze ── *@
|
||||||
|
<MudCard Elevation="2" Class="rounded-xl">
|
||||||
|
<MudCardContent>
|
||||||
|
<MudText Typo="Typo.h6" Style="font-weight: 700; color: var(--mud-palette-primary);" Class="mb-2">
|
||||||
|
§ 1 Geltungsbereich & Transparenz
|
||||||
|
</MudText>
|
||||||
|
<MudText Typo="Typo.body2" Class="mb-3">
|
||||||
|
Diese Bedingungen gelten für die gesamte Nutzung dieses Zeiterfassungs-Tools. Transparenz ist uns extrem wichtig.
|
||||||
|
</MudText>
|
||||||
|
<MudAlert Severity="Severity.Info" Dense="true" Class="rounded-lg">
|
||||||
|
<b>Warum können Geister eigentlich so schlecht lügen?</b><br />
|
||||||
|
Weil sie einfach extrem leicht zu durchschauen sind!
|
||||||
|
</MudAlert>
|
||||||
|
</MudCardContent>
|
||||||
|
</MudCard>
|
||||||
|
|
||||||
|
<MudCard Elevation="2" Class="rounded-xl">
|
||||||
|
<MudCardContent>
|
||||||
|
<MudText Typo="Typo.h6" Style="font-weight: 700; color: var(--mud-palette-primary);" Class="mb-2">
|
||||||
|
§ 2 Pflichten des Nutzers & Gärtnerklauseln
|
||||||
|
</MudText>
|
||||||
|
<MudText Typo="Typo.body2" Class="mb-3">
|
||||||
|
Jeder Nutzer verpflichtet sich, seine Arbeitszeiten wahrheitsgemäß und pünktlich einzutragen. Bei Zuwiderhandlung behalten wir uns vor, den Garten des Nutzers aufzuräumen.
|
||||||
|
</MudText>
|
||||||
|
<MudAlert Severity="Severity.Normal" Dense="true" Class="rounded-lg" Style="border-left: 4px solid #EF6C00; background: rgba(239, 108, 0, 0.05);">
|
||||||
|
<b>Was sagt ein Gärtner, wenn er seinen Arbeitsplatz vorzeitig verlässt?</b><br />
|
||||||
|
"Ich mach mich dann mal vom Acker!"
|
||||||
|
</MudAlert>
|
||||||
|
</MudCardContent>
|
||||||
|
</MudCard>
|
||||||
|
|
||||||
|
<MudCard Elevation="2" Class="rounded-xl">
|
||||||
|
<MudCardContent>
|
||||||
|
<MudText Typo="Typo.h6" Style="font-weight: 700; color: var(--mud-palette-primary);" Class="mb-2">
|
||||||
|
§ 3 Haftungsausschluss & Straßenverkehr
|
||||||
|
</MudText>
|
||||||
|
<MudText Typo="Typo.body2" Class="mb-3">
|
||||||
|
Wir übernehmen keinerlei Haftung für vergessene Pausenzeiten, verpasste Feierabende oder schlechtes Wetter.
|
||||||
|
</MudText>
|
||||||
|
<MudAlert Severity="Severity.Warning" Dense="true" Class="rounded-lg">
|
||||||
|
<b>Was ist rot, rund und steht am Straßenrand?</b><br />
|
||||||
|
Eine Spargelampel!<br /><br />
|
||||||
|
<b>Und warum dürfen Bienen eigentlich nicht in die Kirche?</b><br />
|
||||||
|
Weil sie in der Sekte sind!
|
||||||
|
</MudAlert>
|
||||||
|
</MudCardContent>
|
||||||
|
</MudCard>
|
||||||
|
|
||||||
|
<MudCard Elevation="2" Class="rounded-xl">
|
||||||
|
<MudCardContent>
|
||||||
|
<MudText Typo="Typo.h6" Style="font-weight: 700; color: var(--mud-palette-primary);" Class="mb-2">
|
||||||
|
§ 4 Datensicherheit & Physikalische Grundgesetze
|
||||||
|
</MudText>
|
||||||
|
<MudText Typo="Typo.body2" Class="mb-3">
|
||||||
|
Ihre Daten werden nach modernsten Verschlüsselungsstandards (nicht) an Dritte weitergegeben. Unsere Magnetbänder sind streng gesichert.
|
||||||
|
</MudText>
|
||||||
|
<MudAlert Severity="Severity.Normal" Dense="true" Class="rounded-lg" Style="border-left: 4px solid #00897B; background: rgba(0, 137, 123, 0.05);">
|
||||||
|
<b>Treffen sich zwei Magnete im Rechenzentrum. Sagt der eine ganz verzweifelt:</b><br />
|
||||||
|
"Du, sag mal... Was soll ich heute bloß anziehen?"
|
||||||
|
</MudAlert>
|
||||||
|
</MudCardContent>
|
||||||
|
</MudCard>
|
||||||
|
|
||||||
|
<MudCard Elevation="2" Class="rounded-xl">
|
||||||
|
<MudCardContent>
|
||||||
|
<MudText Typo="Typo.h6" Style="font-weight: 700; color: var(--mud-palette-primary);" Class="mb-2">
|
||||||
|
§ 5 Rückgaberecht & Büroalltag
|
||||||
|
</MudText>
|
||||||
|
<MudText Typo="Typo.body2" Class="mb-3">
|
||||||
|
Erfasste Arbeitszeiten können nicht zurückgenommen, umgetauscht oder bar ausgezahlt werden.
|
||||||
|
</MudText>
|
||||||
|
<MudAlert Severity="Severity.Normal" Dense="true" Class="rounded-lg" Style="border-left: 4px solid #5E35B1; background: rgba(94, 53, 177, 0.05);">
|
||||||
|
<b>Was macht ein gelangweilter Clown im Büro?</b><br />
|
||||||
|
Er macht Faxen!<br /><br />
|
||||||
|
<b>Und warum steht ein einsamer Pilz mitten im tiefen Wald?</b><br />
|
||||||
|
Weil die Tannen zapfen!
|
||||||
|
</MudAlert>
|
||||||
|
</MudCardContent>
|
||||||
|
</MudCard>
|
||||||
|
|
||||||
|
<MudCard Elevation="2" Class="rounded-xl">
|
||||||
|
<MudCardContent>
|
||||||
|
<MudText Typo="Typo.h6" Style="font-weight: 700; color: var(--mud-palette-primary);" Class="mb-2">
|
||||||
|
§ 6 Schlussbestimmungen & Salatgesetze
|
||||||
|
</MudText>
|
||||||
|
<MudText Typo="Typo.body2" Class="mb-3">
|
||||||
|
Sollten einzelne Bestimmungen dieser AGB unwirksam sein, bleibt die Fröhlichkeit aller anderen Bestimmungen unberührt.
|
||||||
|
</MudText>
|
||||||
|
<MudAlert Severity="Severity.Success" Dense="true" Class="rounded-lg">
|
||||||
|
<b>Wie nennt man ein plötzlich spurlos verschwundenes Stück Rindfleisch?</b><br />
|
||||||
|
Gulasch!<br /><br />
|
||||||
|
<b>Was ist grün, gesund und klopft nachts an die Haustür?</b><br />
|
||||||
|
Ein Klopfsalat!<br /><br />
|
||||||
|
<b>Und zu guter Letzt: Warum fliegen Vögel im Winter eigentlich nach Süden?</b><br />
|
||||||
|
Weil es zu Fuß einfach viel zu weit wäre!
|
||||||
|
</MudAlert>
|
||||||
|
</MudCardContent>
|
||||||
|
</MudCard>
|
||||||
|
|
||||||
|
@* ── Back Button ── *@
|
||||||
|
<MudStack Row="true" Justify="Justify.Center" Class="mt-4">
|
||||||
|
<MudButton Variant="Variant.Filled" Color="Color.Primary" StartIcon="@Icons.Material.Filled.ArrowBack" OnClick="GoBack" Style="border-radius: 20px;">
|
||||||
|
Zurück zur Anmeldung
|
||||||
|
</MudButton>
|
||||||
|
</MudStack>
|
||||||
|
|
||||||
|
</MudStack>
|
||||||
|
</MudContainer>
|
||||||
|
|
||||||
|
@code {
|
||||||
|
[Inject] private NavigationManager Nav { get; set; } = default!;
|
||||||
|
|
||||||
|
private void GoBack()
|
||||||
|
{
|
||||||
|
Nav.NavigateTo("/login");
|
||||||
|
}
|
||||||
|
}
|
||||||
+23
-4
@@ -1,6 +1,6 @@
|
|||||||
@page "/changelog"
|
@page "/changelog"
|
||||||
@rendermode InteractiveServer
|
@rendermode InteractiveWebAssembly
|
||||||
@attribute [Authorize]
|
@attribute [AllowAnonymous]
|
||||||
|
|
||||||
<PageTitle>Changelog – Timetracker</PageTitle>
|
<PageTitle>Changelog – Timetracker</PageTitle>
|
||||||
|
|
||||||
@@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
@* ── Header ── *@
|
@* ── Header ── *@
|
||||||
<MudPaper Elevation="4" Class="pa-5 rounded-xl"
|
<MudPaper Elevation="4" Class="pa-5 rounded-xl"
|
||||||
Style="background: linear-gradient(135deg, #3F51B5 0%, #1A237E 100%); color:white;">
|
Style="background: #1E293B; color:white;">
|
||||||
<MudStack Row="true" AlignItems="AlignItems.Center" Spacing="3">
|
<MudStack Row="true" AlignItems="AlignItems.Center" Spacing="3">
|
||||||
<MudIcon Icon="@Icons.Material.Filled.NewReleases" Style="color:white; font-size:2rem" />
|
<MudIcon Icon="@Icons.Material.Filled.NewReleases" Style="color:white; font-size:2rem" />
|
||||||
<MudStack Spacing="0">
|
<MudStack Spacing="0">
|
||||||
@@ -68,7 +68,26 @@
|
|||||||
|
|
||||||
private readonly List<Release> _releases =
|
private readonly List<Release> _releases =
|
||||||
[
|
[
|
||||||
new("1.1", "08.06.2026", true,
|
new("1.4", "08.06.2026", true,
|
||||||
|
[
|
||||||
|
new("Neu", "Timebot implementiert"),
|
||||||
|
new("Neu", "Onboarding Tour"),
|
||||||
|
new("Upgrade", "Security hardening"),
|
||||||
|
new("Upgrade", "Changed coloring"),
|
||||||
|
]),
|
||||||
|
new("1.3", "08.06.2026", false,
|
||||||
|
[
|
||||||
|
new("Fix", "Browser-Tab hat statischen Text angezeigt und sich nicht dynamisch an die jeweilige Seite angepasst"),
|
||||||
|
|
||||||
|
]),
|
||||||
|
new("1.2", "08.06.2026", false,
|
||||||
|
[
|
||||||
|
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("1.1", "08.06.2026", false,
|
||||||
[
|
[
|
||||||
new("Neu", "Versionsnummer in der Navbar mit Link zum Changelog"),
|
new("Neu", "Versionsnummer in der Navbar mit Link zum Changelog"),
|
||||||
new("Neu", "Changelog-Seite"),
|
new("Neu", "Changelog-Seite"),
|
||||||
+5
-5
@@ -1,8 +1,8 @@
|
|||||||
@page "/feiertage"
|
@page "/feiertage"
|
||||||
@rendermode InteractiveServer
|
@rendermode InteractiveWebAssembly
|
||||||
@attribute [Authorize]
|
@attribute [Authorize]
|
||||||
@inject HolidayService HolidayService
|
@inject IHolidayService HolidayService
|
||||||
@inject TimetrackerService TrackerService
|
@inject ITimetrackerService TrackerService
|
||||||
@inject AuthenticationStateProvider AuthStateProvider
|
@inject AuthenticationStateProvider AuthStateProvider
|
||||||
|
|
||||||
<PageTitle>Feiertage – Timetracker</PageTitle>
|
<PageTitle>Feiertage – Timetracker</PageTitle>
|
||||||
@@ -20,7 +20,7 @@ else
|
|||||||
|
|
||||||
@* ── Header ── *@
|
@* ── Header ── *@
|
||||||
<MudPaper Elevation="4" Class="pa-5 rounded-xl"
|
<MudPaper Elevation="4" Class="pa-5 rounded-xl"
|
||||||
Style="background: linear-gradient(135deg, #00897B 0%, #004D40 100%); color: white;">
|
Style="background: #0F766E; color: white;">
|
||||||
<MudStack Row="true" AlignItems="AlignItems.Center" Justify="Justify.SpaceBetween">
|
<MudStack Row="true" AlignItems="AlignItems.Center" Justify="Justify.SpaceBetween">
|
||||||
<MudIconButton Icon="@Icons.Material.Filled.ChevronLeft"
|
<MudIconButton Icon="@Icons.Material.Filled.ChevronLeft"
|
||||||
Style="color:white" Size="Size.Large" OnClick="PrevYear" />
|
Style="color:white" Size="Size.Large" OnClick="PrevYear" />
|
||||||
@@ -140,7 +140,7 @@ else
|
|||||||
|
|
||||||
@* ── Zusammenfassung ── *@
|
@* ── Zusammenfassung ── *@
|
||||||
<MudPaper Elevation="2" Class="pa-4 rounded-xl"
|
<MudPaper Elevation="2" Class="pa-4 rounded-xl"
|
||||||
Style="background: linear-gradient(90deg, rgba(0,137,123,0.08) 0%, transparent 100%); border-left: 4px solid #00897B;">
|
Style="background: linear-gradient(90deg, rgba(15,118,110,0.08) 0%, transparent 100%); border-left: 4px solid #0F766E;">
|
||||||
<MudStack Row="true" Spacing="4" Wrap="Wrap.Wrap" AlignItems="AlignItems.Center">
|
<MudStack Row="true" Spacing="4" Wrap="Wrap.Wrap" AlignItems="AlignItems.Center">
|
||||||
<MudStack Row="true" AlignItems="AlignItems.Center" Spacing="1">
|
<MudStack Row="true" AlignItems="AlignItems.Center" Spacing="1">
|
||||||
<MudIcon Icon="@Icons.Material.Filled.Celebration" Style="color:#00897B" />
|
<MudIcon Icon="@Icons.Material.Filled.Celebration" Style="color:#00897B" />
|
||||||
@@ -1,10 +1,11 @@
|
|||||||
@page "/"
|
@page "/"
|
||||||
@rendermode InteractiveServer
|
@rendermode InteractiveWebAssembly
|
||||||
@attribute [Authorize]
|
@attribute [Authorize]
|
||||||
@inject TimetrackerService TrackerService
|
@inject ITimetrackerService TrackerService
|
||||||
@inject HolidayService HolidayService
|
@inject IHolidayService HolidayService
|
||||||
@inject ISnackbar Snackbar
|
@inject ISnackbar Snackbar
|
||||||
@inject AuthenticationStateProvider AuthStateProvider
|
@inject AuthenticationStateProvider AuthStateProvider
|
||||||
|
@inject IJSRuntime JSRuntime
|
||||||
|
|
||||||
<PageTitle>KW @_kw – Wochenübersicht – Timetracker</PageTitle>
|
<PageTitle>KW @_kw – Wochenübersicht – Timetracker</PageTitle>
|
||||||
|
|
||||||
@@ -20,8 +21,8 @@ else
|
|||||||
<MudStack Spacing="3">
|
<MudStack Spacing="3">
|
||||||
|
|
||||||
@* ── Wochen-Header ── *@
|
@* ── Wochen-Header ── *@
|
||||||
<MudPaper Elevation="4" Class="pa-5 rounded-xl"
|
<MudPaper Elevation="4" Class="pa-5 rounded-xl onboarding-week-header"
|
||||||
Style="background: linear-gradient(135deg, #3F51B5 0%, #1A237E 100%); color: white;">
|
Style="background: #1E293B; color: white;">
|
||||||
<MudStack Row="true" AlignItems="AlignItems.Center" Justify="Justify.SpaceBetween">
|
<MudStack Row="true" AlignItems="AlignItems.Center" Justify="Justify.SpaceBetween">
|
||||||
<MudIconButton Icon="@Icons.Material.Filled.ChevronLeft"
|
<MudIconButton Icon="@Icons.Material.Filled.ChevronLeft"
|
||||||
Style="color:white" Size="Size.Large" OnClick="PrevWeek" />
|
Style="color:white" Size="Size.Large" OnClick="PrevWeek" />
|
||||||
@@ -93,9 +94,9 @@ else
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
@* ── Arbeitstag: vollständige Karte ── *@
|
@* ── Arbeitstag: vollständige Karte ── *@
|
||||||
<MudCard @key="@day.Date" Elevation="@(isToday ? 6 : 2)" Class="rounded-xl"
|
<MudCard @key="@day.Date" Elevation="@(isToday ? 6 : 2)" Class="rounded-xl onboarding-day-card"
|
||||||
Style="@($"border-left: 4px solid {borderColor};")">
|
Style="@($"border-left: 4px solid {borderColor};")">
|
||||||
<MudCardHeader Style="@(isToday ? "background: linear-gradient(90deg, rgba(63,81,181,0.07) 0%, transparent 100%);" : "")">
|
<MudCardHeader Style="@(isToday ? "background: linear-gradient(90deg, rgba(14,165,233,0.07) 0%, transparent 100%);" : "")">
|
||||||
<CardHeaderContent>
|
<CardHeaderContent>
|
||||||
<MudStack Row="true" AlignItems="AlignItems.Center" Justify="Justify.SpaceBetween">
|
<MudStack Row="true" AlignItems="AlignItems.Center" Justify="Justify.SpaceBetween">
|
||||||
<MudStack Spacing="0">
|
<MudStack Spacing="0">
|
||||||
@@ -269,8 +270,8 @@ else
|
|||||||
}
|
}
|
||||||
|
|
||||||
@* ── Wochensumme ── *@
|
@* ── Wochensumme ── *@
|
||||||
<MudPaper Elevation="4" Class="pa-5 rounded-xl"
|
<MudPaper Elevation="4" Class="pa-5 rounded-xl onboarding-week-summary"
|
||||||
Style="background: linear-gradient(135deg, #1A237E 0%, #283593 100%); color:white;">
|
Style="background: #0F172A; color:white;">
|
||||||
<MudStack Row="true" AlignItems="AlignItems.Center" Spacing="2" Class="mb-4">
|
<MudStack Row="true" AlignItems="AlignItems.Center" Spacing="2" Class="mb-4">
|
||||||
<MudIcon Icon="@Icons.Material.Filled.Summarize" Style="color:rgba(255,255,255,0.8)" />
|
<MudIcon Icon="@Icons.Material.Filled.Summarize" Style="color:rgba(255,255,255,0.8)" />
|
||||||
<MudText Typo="Typo.h6" Style="color:white; font-weight:600">Wochensumme</MudText>
|
<MudText Typo="Typo.h6" Style="color:white; font-weight:600">Wochensumme</MudText>
|
||||||
@@ -306,7 +307,7 @@ else
|
|||||||
</MudPaper>
|
</MudPaper>
|
||||||
|
|
||||||
@* ── Gleitzeitkonto ── *@
|
@* ── Gleitzeitkonto ── *@
|
||||||
<MudPaper Elevation="3" Class="pa-5 rounded-xl"
|
<MudPaper Elevation="3" Class="pa-5 rounded-xl onboarding-overtime-balance"
|
||||||
Style="@($"border-left: 6px solid {(_totalOvertime >= TimeSpan.Zero ? "#4CAF50" : "#FF9800")};")">
|
Style="@($"border-left: 6px solid {(_totalOvertime >= TimeSpan.Zero ? "#4CAF50" : "#FF9800")};")">
|
||||||
<MudStack Row="true" AlignItems="AlignItems.Center" Justify="Justify.SpaceBetween" Wrap="Wrap.Wrap" Spacing="3">
|
<MudStack Row="true" AlignItems="AlignItems.Center" Justify="Justify.SpaceBetween" Wrap="Wrap.Wrap" Spacing="3">
|
||||||
<MudStack Row="true" AlignItems="AlignItems.Center" Spacing="2">
|
<MudStack Row="true" AlignItems="AlignItems.Center" Spacing="2">
|
||||||
@@ -328,6 +329,11 @@ else
|
|||||||
</MudPaper>
|
</MudPaper>
|
||||||
|
|
||||||
</MudStack>
|
</MudStack>
|
||||||
|
|
||||||
|
@if (_showOnboarding)
|
||||||
|
{
|
||||||
|
<OnboardingTour OnFinished="HandleOnboardingFinished" />
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@code {
|
@code {
|
||||||
@@ -347,6 +353,7 @@ else
|
|||||||
private TimeSpan _totalOvertime;
|
private TimeSpan _totalOvertime;
|
||||||
private Dictionary<DateOnly, string> _holidays = [];
|
private Dictionary<DateOnly, string> _holidays = [];
|
||||||
private int _holidayYear = -1;
|
private int _holidayYear = -1;
|
||||||
|
private bool _showOnboarding;
|
||||||
|
|
||||||
private bool IsCurrentWeek => _monday == GetMonday(DateOnly.FromDateTime(DateTime.Today));
|
private bool IsCurrentWeek => _monday == GetMonday(DateOnly.FromDateTime(DateTime.Today));
|
||||||
|
|
||||||
@@ -358,20 +365,56 @@ else
|
|||||||
_userId = int.Parse(claim.Value);
|
_userId = int.Parse(claim.Value);
|
||||||
_monday = GetMonday(DateOnly.FromDateTime(DateTime.Today));
|
_monday = GetMonday(DateOnly.FromDateTime(DateTime.Today));
|
||||||
_settings = await TrackerService.GetSettingsAsync(_userId);
|
_settings = await TrackerService.GetSettingsAsync(_userId);
|
||||||
await LoadWeek();
|
|
||||||
_totalOvertime = await TrackerService.GetTotalOvertimeAsync(_userId, _settings);
|
var loadWeekTask = LoadWeek();
|
||||||
|
var overtimeTask = TrackerService.GetTotalOvertimeAsync(_userId, _settings);
|
||||||
|
|
||||||
|
await Task.WhenAll(loadWeekTask, overtimeTask);
|
||||||
|
_totalOvertime = await overtimeTask;
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var showOnb = await JSRuntime.InvokeAsync<string>("localStorage.getItem", "showOnboarding");
|
||||||
|
_showOnboarding = showOnb == "true";
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
// Ignored during prerendering/SSR
|
||||||
|
}
|
||||||
|
|
||||||
_loading = false;
|
_loading = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async Task HandleOnboardingFinished()
|
||||||
|
{
|
||||||
|
_showOnboarding = false;
|
||||||
|
await JSRuntime.InvokeVoidAsync("localStorage.setItem", "showOnboarding", "false");
|
||||||
|
}
|
||||||
|
|
||||||
private async Task LoadWeek()
|
private async Task LoadWeek()
|
||||||
{
|
{
|
||||||
|
Task<List<PublicHoliday>> holidaysTask;
|
||||||
if (_monday.Year != _holidayYear)
|
if (_monday.Year != _holidayYear)
|
||||||
{
|
{
|
||||||
var list = await HolidayService.GetHolidaysAsync(_monday.Year, _settings.GermanState);
|
holidaysTask = HolidayService.GetHolidaysAsync(_monday.Year, _settings.GermanState);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
holidaysTask = Task.FromResult(new List<PublicHoliday>());
|
||||||
|
}
|
||||||
|
|
||||||
|
var dbDaysTask = TrackerService.GetWeekAsync(_userId, _monday);
|
||||||
|
|
||||||
|
await Task.WhenAll(holidaysTask, dbDaysTask);
|
||||||
|
|
||||||
|
if (_monday.Year != _holidayYear)
|
||||||
|
{
|
||||||
|
var list = await holidaysTask;
|
||||||
_holidays = list.ToDictionary(h => h.Date, h => h.Name);
|
_holidays = list.ToDictionary(h => h.Date, h => h.Name);
|
||||||
_holidayYear = _monday.Year;
|
_holidayYear = _monday.Year;
|
||||||
}
|
}
|
||||||
var dbDays = await TrackerService.GetWeekAsync(_userId, _monday);
|
|
||||||
|
var dbDays = await dbDaysTask;
|
||||||
_days = Enumerable.Range(0, 7).Select(i =>
|
_days = Enumerable.Range(0, 7).Select(i =>
|
||||||
{
|
{
|
||||||
var date = _monday.AddDays(i);
|
var date = _monday.AddDays(i);
|
||||||
@@ -1,6 +1,9 @@
|
|||||||
@page "/login"
|
@page "/login"
|
||||||
|
@rendermode InteractiveWebAssembly
|
||||||
@attribute [AllowAnonymous]
|
@attribute [AllowAnonymous]
|
||||||
|
@inject IAuthService AuthService
|
||||||
@inject NavigationManager Nav
|
@inject NavigationManager Nav
|
||||||
|
@inject IJSRuntime JSRuntime
|
||||||
|
|
||||||
<PageTitle>Anmelden – Timetracker</PageTitle>
|
<PageTitle>Anmelden – Timetracker</PageTitle>
|
||||||
|
|
||||||
@@ -10,20 +13,20 @@
|
|||||||
@* ── Logo / Header ── *@
|
@* ── Logo / Header ── *@
|
||||||
<MudStack AlignItems="AlignItems.Center" Spacing="1">
|
<MudStack AlignItems="AlignItems.Center" Spacing="1">
|
||||||
<MudIcon Icon="@Icons.Material.Filled.AccessTime"
|
<MudIcon Icon="@Icons.Material.Filled.AccessTime"
|
||||||
Style="font-size:4rem; color:#1565C0" />
|
Style="font-size:4rem; color:#0EA5E9" />
|
||||||
<MudText Typo="Typo.h4" Style="font-weight:700; color:#1565C0">Timetracker</MudText>
|
<MudText Typo="Typo.h4" Style="font-weight:700; color:#0EA5E9">Timetracker</MudText>
|
||||||
</MudStack>
|
</MudStack>
|
||||||
|
|
||||||
<MudPaper Elevation="4" Class="pa-6 rounded-xl" Style="width:100%">
|
<MudPaper Elevation="4" Class="pa-6 rounded-xl" Style="width:100%">
|
||||||
@* ── Static Tab Navigation ── *@
|
@* ── Tab Navigation ── *@
|
||||||
<MudStack Row="true" Justify="Justify.Center" Class="mb-4">
|
<MudStack Row="true" Justify="Justify.Center" Class="mb-4">
|
||||||
<MudButton Href="/login"
|
<MudButton OnClick="@(() => SetTab(0))"
|
||||||
Variant="@(_activeTab == 0 ? Variant.Filled : Variant.Text)"
|
Variant="@(_activeTab == 0 ? Variant.Filled : Variant.Text)"
|
||||||
Color="Color.Primary"
|
Color="Color.Primary"
|
||||||
Style="min-width: 120px; border-radius: 20px;">
|
Style="min-width: 120px; border-radius: 20px;">
|
||||||
Anmelden
|
Anmelden
|
||||||
</MudButton>
|
</MudButton>
|
||||||
<MudButton Href="/login?tab=register"
|
<MudButton OnClick="@(() => SetTab(1))"
|
||||||
Variant="@(_activeTab == 1 ? Variant.Filled : Variant.Text)"
|
Variant="@(_activeTab == 1 ? Variant.Filled : Variant.Text)"
|
||||||
Color="Color.Primary"
|
Color="Color.Primary"
|
||||||
Style="min-width: 120px; border-radius: 20px;">
|
Style="min-width: 120px; border-radius: 20px;">
|
||||||
@@ -41,14 +44,14 @@
|
|||||||
{
|
{
|
||||||
<MudAlert Severity="Severity.Error" Dense="true">@_error</MudAlert>
|
<MudAlert Severity="Severity.Error" Dense="true">@_error</MudAlert>
|
||||||
}
|
}
|
||||||
<form action="/auth/login" method="post">
|
<EditForm Model="@_loginModel" OnValidSubmit="HandleLogin">
|
||||||
<MudStack Spacing="3">
|
<MudStack Spacing="3">
|
||||||
<MudTextField T="string"
|
<MudTextField T="string"
|
||||||
Label="Benutzername"
|
Label="Benutzername"
|
||||||
Variant="Variant.Outlined"
|
Variant="Variant.Outlined"
|
||||||
Adornment="Adornment.Start"
|
Adornment="Adornment.Start"
|
||||||
AdornmentIcon="@Icons.Material.Filled.Person"
|
AdornmentIcon="@Icons.Material.Filled.Person"
|
||||||
name="username"
|
@bind-Value="_loginModel.Username"
|
||||||
Required="true"
|
Required="true"
|
||||||
AutoFocus="true" />
|
AutoFocus="true" />
|
||||||
<MudTextField T="string"
|
<MudTextField T="string"
|
||||||
@@ -57,7 +60,7 @@
|
|||||||
Adornment="Adornment.Start"
|
Adornment="Adornment.Start"
|
||||||
AdornmentIcon="@Icons.Material.Filled.Lock"
|
AdornmentIcon="@Icons.Material.Filled.Lock"
|
||||||
InputType="InputType.Password"
|
InputType="InputType.Password"
|
||||||
name="password"
|
@bind-Value="_loginModel.Password"
|
||||||
Required="true" />
|
Required="true" />
|
||||||
<MudButton ButtonType="ButtonType.Submit"
|
<MudButton ButtonType="ButtonType.Submit"
|
||||||
Variant="Variant.Filled"
|
Variant="Variant.Filled"
|
||||||
@@ -65,11 +68,16 @@
|
|||||||
FullWidth="true"
|
FullWidth="true"
|
||||||
Size="Size.Large"
|
Size="Size.Large"
|
||||||
StartIcon="@Icons.Material.Filled.Login"
|
StartIcon="@Icons.Material.Filled.Login"
|
||||||
Class="mt-2">
|
Class="mt-2"
|
||||||
|
Disabled="_loading">
|
||||||
|
@if (_loading)
|
||||||
|
{
|
||||||
|
<MudProgressCircular Size="Size.Small" Indeterminate="true" Class="mr-2" />
|
||||||
|
}
|
||||||
Anmelden
|
Anmelden
|
||||||
</MudButton>
|
</MudButton>
|
||||||
</MudStack>
|
</MudStack>
|
||||||
</form>
|
</EditForm>
|
||||||
</MudStack>
|
</MudStack>
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -80,14 +88,14 @@
|
|||||||
{
|
{
|
||||||
<MudAlert Severity="Severity.Error" Dense="true">@_error</MudAlert>
|
<MudAlert Severity="Severity.Error" Dense="true">@_error</MudAlert>
|
||||||
}
|
}
|
||||||
<form action="/auth/register" method="post">
|
<EditForm Model="@_registerModel" OnValidSubmit="HandleRegister">
|
||||||
<MudStack Spacing="3">
|
<MudStack Spacing="3">
|
||||||
<MudTextField T="string"
|
<MudTextField T="string"
|
||||||
Label="Benutzername"
|
Label="Benutzername"
|
||||||
Variant="Variant.Outlined"
|
Variant="Variant.Outlined"
|
||||||
Adornment="Adornment.Start"
|
Adornment="Adornment.Start"
|
||||||
AdornmentIcon="@Icons.Material.Filled.Person"
|
AdornmentIcon="@Icons.Material.Filled.Person"
|
||||||
name="username"
|
@bind-Value="_registerModel.Username"
|
||||||
Required="true"
|
Required="true"
|
||||||
HelperText="Mindestens 3 Zeichen" />
|
HelperText="Mindestens 3 Zeichen" />
|
||||||
<MudTextField T="string"
|
<MudTextField T="string"
|
||||||
@@ -96,20 +104,31 @@
|
|||||||
Adornment="Adornment.Start"
|
Adornment="Adornment.Start"
|
||||||
AdornmentIcon="@Icons.Material.Filled.Lock"
|
AdornmentIcon="@Icons.Material.Filled.Lock"
|
||||||
InputType="InputType.Password"
|
InputType="InputType.Password"
|
||||||
name="password"
|
@bind-Value="_registerModel.Password"
|
||||||
Required="true"
|
Required="true"
|
||||||
HelperText="Mindestens 6 Zeichen" />
|
HelperText="Mindestens 6 Zeichen" />
|
||||||
|
<input type="text" style="display: none;" tabindex="-1" autocomplete="off" @bind="_honeypot" />
|
||||||
|
|
||||||
|
<MudCheckBox @bind-Value="_acceptAgb" Color="Color.Secondary" Class="mt-1">
|
||||||
|
<MudText Typo="Typo.body2">Ich akzeptiere die <a href="/agb" target="_blank" style="color: var(--mud-palette-secondary); text-decoration: underline; font-weight: 600;">AGB</a>.</MudText>
|
||||||
|
</MudCheckBox>
|
||||||
|
|
||||||
<MudButton ButtonType="ButtonType.Submit"
|
<MudButton ButtonType="ButtonType.Submit"
|
||||||
Variant="Variant.Filled"
|
Variant="Variant.Filled"
|
||||||
Color="Color.Secondary"
|
Color="Color.Secondary"
|
||||||
FullWidth="true"
|
FullWidth="true"
|
||||||
Size="Size.Large"
|
Size="Size.Large"
|
||||||
StartIcon="@Icons.Material.Filled.PersonAdd"
|
StartIcon="@Icons.Material.Filled.PersonAdd"
|
||||||
Class="mt-2">
|
Class="mt-2"
|
||||||
|
Disabled="_loading || !_acceptAgb">
|
||||||
|
@if (_loading)
|
||||||
|
{
|
||||||
|
<MudProgressCircular Size="Size.Small" Indeterminate="true" Class="mr-2" />
|
||||||
|
}
|
||||||
Konto erstellen
|
Konto erstellen
|
||||||
</MudButton>
|
</MudButton>
|
||||||
</MudStack>
|
</MudStack>
|
||||||
</form>
|
</EditForm>
|
||||||
</MudStack>
|
</MudStack>
|
||||||
}
|
}
|
||||||
</MudPaper>
|
</MudPaper>
|
||||||
@@ -119,6 +138,12 @@
|
|||||||
@code {
|
@code {
|
||||||
private int _activeTab = 0;
|
private int _activeTab = 0;
|
||||||
private string? _error;
|
private string? _error;
|
||||||
|
private bool _loading;
|
||||||
|
private string _honeypot = "";
|
||||||
|
private bool _acceptAgb;
|
||||||
|
|
||||||
|
private readonly AuthModel _loginModel = new();
|
||||||
|
private readonly AuthModel _registerModel = new();
|
||||||
|
|
||||||
[SupplyParameterFromQuery(Name = "error")]
|
[SupplyParameterFromQuery(Name = "error")]
|
||||||
public string? ErrorParam { get; set; }
|
public string? ErrorParam { get; set; }
|
||||||
@@ -136,5 +161,74 @@
|
|||||||
};
|
};
|
||||||
_activeTab = TabParam == "register" ? 1 : 0;
|
_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()
|
||||||
|
{
|
||||||
|
if (!_acceptAgb)
|
||||||
|
{
|
||||||
|
_error = "Du musst die AGB akzeptieren.";
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
_loading = true;
|
||||||
|
_error = null;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var (user, error) = await AuthService.RegisterAsync(_registerModel.Username, _registerModel.Password, _honeypot);
|
||||||
|
if (user != null)
|
||||||
|
{
|
||||||
|
await JSRuntime.InvokeVoidAsync("localStorage.setItem", "showOnboarding", "true");
|
||||||
|
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; } = "";
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
@page "/month"
|
@page "/month"
|
||||||
@rendermode InteractiveServer
|
@rendermode InteractiveWebAssembly
|
||||||
@attribute [Authorize]
|
@attribute [Authorize]
|
||||||
@inject TimetrackerService TrackerService
|
@inject ITimetrackerService TrackerService
|
||||||
@inject HolidayService HolidayService
|
@inject IHolidayService HolidayService
|
||||||
@inject AuthenticationStateProvider AuthStateProvider
|
@inject AuthenticationStateProvider AuthStateProvider
|
||||||
|
|
||||||
<PageTitle>@_deCulture.DateTimeFormat.GetMonthName(_month) @_year – Monatsübersicht – Timetracker</PageTitle>
|
<PageTitle>@_deCulture.DateTimeFormat.GetMonthName(_month) @_year – Monatsübersicht – Timetracker</PageTitle>
|
||||||
@@ -20,7 +20,7 @@ else
|
|||||||
|
|
||||||
@* ── Monats-Header ── *@
|
@* ── Monats-Header ── *@
|
||||||
<MudPaper Elevation="4" Class="pa-5 rounded-xl"
|
<MudPaper Elevation="4" Class="pa-5 rounded-xl"
|
||||||
Style="background: linear-gradient(135deg, #3F51B5 0%, #1A237E 100%); color: white;">
|
Style="background: #1E293B; color: white;">
|
||||||
<MudStack Row="true" AlignItems="AlignItems.Center" Justify="Justify.SpaceBetween">
|
<MudStack Row="true" AlignItems="AlignItems.Center" Justify="Justify.SpaceBetween">
|
||||||
<MudIconButton Icon="@Icons.Material.Filled.ChevronLeft"
|
<MudIconButton Icon="@Icons.Material.Filled.ChevronLeft"
|
||||||
Style="color:white" Size="Size.Large" OnClick="PrevMonth" />
|
Style="color:white" Size="Size.Large" OnClick="PrevMonth" />
|
||||||
@@ -51,7 +51,7 @@ else
|
|||||||
<MudCardContent Class="pa-0">
|
<MudCardContent Class="pa-0">
|
||||||
<MudSimpleTable Dense="true" Striped="false" Hover="true" Style="overflow-x:auto">
|
<MudSimpleTable Dense="true" Striped="false" Hover="true" Style="overflow-x:auto">
|
||||||
<thead>
|
<thead>
|
||||||
<tr style="background: rgba(63,81,181,0.08);">
|
<tr style="background: rgba(14,165,233,0.08);">
|
||||||
<th style="font-weight:700; padding:10px 16px">Tag</th>
|
<th style="font-weight:700; padding:10px 16px">Tag</th>
|
||||||
<th style="font-weight:700; padding:10px 16px">Start</th>
|
<th style="font-weight:700; padding:10px 16px">Start</th>
|
||||||
<th style="font-weight:700; padding:10px 16px">Ende</th>
|
<th style="font-weight:700; padding:10px 16px">Ende</th>
|
||||||
@@ -95,7 +95,7 @@ else
|
|||||||
|
|
||||||
@* ── Monatszusammenfassung ── *@
|
@* ── Monatszusammenfassung ── *@
|
||||||
<MudPaper Elevation="4" Class="pa-5 rounded-xl"
|
<MudPaper Elevation="4" Class="pa-5 rounded-xl"
|
||||||
Style="background: linear-gradient(135deg, rgba(63,81,181,0.08) 0%, rgba(26,35,126,0.04) 100%); border-left: 6px solid #3F51B5;">
|
Style="background: linear-gradient(135deg, rgba(14,165,233,0.08) 0%, rgba(14,165,233,0.02) 100%); border-left: 6px solid #0EA5E9;">
|
||||||
<MudStack Row="true" AlignItems="AlignItems.Center" Spacing="2" Class="mb-4">
|
<MudStack Row="true" AlignItems="AlignItems.Center" Spacing="2" Class="mb-4">
|
||||||
<MudIcon Icon="@Icons.Material.Filled.CalendarViewMonth" Color="Color.Primary" />
|
<MudIcon Icon="@Icons.Material.Filled.CalendarViewMonth" Color="Color.Primary" />
|
||||||
<MudText Typo="Typo.h6" Style="font-weight:700">Monatszusammenfassung</MudText>
|
<MudText Typo="Typo.h6" Style="font-weight:700">Monatszusammenfassung</MudText>
|
||||||
@@ -181,9 +181,15 @@ else
|
|||||||
|
|
||||||
private async Task LoadMonth()
|
private async Task LoadMonth()
|
||||||
{
|
{
|
||||||
var workDays = await TrackerService.GetMonthAsync(_userId, _year, _month);
|
var workDaysTask = TrackerService.GetMonthAsync(_userId, _year, _month);
|
||||||
var holidays = await HolidayService.GetHolidaysAsync(_year, _settings.GermanState);
|
var holidaysTask = HolidayService.GetHolidaysAsync(_year, _settings.GermanState);
|
||||||
var vacations = await TrackerService.GetVacationDaysAsync(_userId, _year);
|
var vacationsTask = TrackerService.GetVacationDaysAsync(_userId, _year);
|
||||||
|
|
||||||
|
await Task.WhenAll(workDaysTask, holidaysTask, vacationsTask);
|
||||||
|
|
||||||
|
var workDays = await workDaysTask;
|
||||||
|
var holidays = await holidaysTask;
|
||||||
|
var vacations = await vacationsTask;
|
||||||
|
|
||||||
var holidayMap = holidays.ToDictionary(h => h.Date, h => h.Name);
|
var holidayMap = holidays.ToDictionary(h => h.Date, h => h.Name);
|
||||||
var vacationSet = vacations.Select(v => v.Date).ToHashSet();
|
var vacationSet = vacations.Select(v => v.Date).ToHashSet();
|
||||||
@@ -0,0 +1,179 @@
|
|||||||
|
@inject IJSRuntime JS
|
||||||
|
|
||||||
|
@if (_active)
|
||||||
|
{
|
||||||
|
@* Dark Backdrop Overlay *@
|
||||||
|
<div class="onboarding-backdrop"></div>
|
||||||
|
|
||||||
|
@* Onboarding Instruction Card *@
|
||||||
|
<div class="onboarding-card-container">
|
||||||
|
<MudCard Class="onboarding-info-card pa-5 rounded-xl shadow-2xl">
|
||||||
|
<MudCardContent Class="pa-0">
|
||||||
|
<MudStack Spacing="3">
|
||||||
|
@* Header / Title *@
|
||||||
|
<MudStack Row="true" AlignItems="AlignItems.Center" Spacing="2">
|
||||||
|
<MudIcon Icon="@Icons.Material.Filled.AutoAwesome" Style="color: #0EA5E9;" />
|
||||||
|
<MudText Typo="Typo.h6" Style="font-weight: 700; color: white;">
|
||||||
|
@_steps[_currentStep].Title
|
||||||
|
</MudText>
|
||||||
|
</MudStack>
|
||||||
|
|
||||||
|
@* Explanation Text *@
|
||||||
|
<MudText Typo="Typo.body2" Style="color: #CBD5E1; line-height: 1.6; min-height: 60px;">
|
||||||
|
@_steps[_currentStep].Content
|
||||||
|
</MudText>
|
||||||
|
|
||||||
|
@* Footer / Progress & Buttons *@
|
||||||
|
<MudStack Row="true" AlignItems="AlignItems.Center" Justify="Justify.SpaceBetween" Class="mt-2">
|
||||||
|
@* Step Count *@
|
||||||
|
<MudText Typo="Typo.caption" Style="color: #94A3B8; font-weight: 600;">
|
||||||
|
Schritt @(_currentStep + 1) von @_steps.Count
|
||||||
|
</MudText>
|
||||||
|
|
||||||
|
@* Navigation Button Stack *@
|
||||||
|
<MudStack Row="true" Spacing="2" AlignItems="AlignItems.Center">
|
||||||
|
@if (_currentStep > 0)
|
||||||
|
{
|
||||||
|
<MudButton Variant="Variant.Text"
|
||||||
|
Style="color: #94A3B8; text-transform: none; border-radius: 12px;"
|
||||||
|
OnClick="PrevStep"
|
||||||
|
Size="Size.Small">
|
||||||
|
Zurück
|
||||||
|
</MudButton>
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
<MudButton Variant="Variant.Text"
|
||||||
|
Style="color: #94A3B8; text-transform: none; border-radius: 12px;"
|
||||||
|
OnClick="CompleteTour"
|
||||||
|
Size="Size.Small">
|
||||||
|
Überspringen
|
||||||
|
</MudButton>
|
||||||
|
}
|
||||||
|
|
||||||
|
<MudButton Variant="Variant.Filled"
|
||||||
|
Color="Color.Secondary"
|
||||||
|
Style="text-transform: none; border-radius: 12px; font-weight: 700; min-width: 80px;"
|
||||||
|
OnClick="NextStep"
|
||||||
|
Size="Size.Small">
|
||||||
|
@(_currentStep == _steps.Count - 1 ? "Fertig" : "Weiter")
|
||||||
|
</MudButton>
|
||||||
|
</MudStack>
|
||||||
|
</MudStack>
|
||||||
|
</MudStack>
|
||||||
|
</MudCardContent>
|
||||||
|
</MudCard>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
|
||||||
|
<style>
|
||||||
|
/* Backdrop behind cards but below the spotlight highlight */
|
||||||
|
.onboarding-backdrop {
|
||||||
|
position: fixed;
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
|
width: 100vw;
|
||||||
|
height: 100vh;
|
||||||
|
background: rgba(15, 23, 42, 0.4);
|
||||||
|
backdrop-filter: blur(2px);
|
||||||
|
z-index: 9999;
|
||||||
|
pointer-events: all;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Fixed positioned instruction box at the bottom center */
|
||||||
|
.onboarding-card-container {
|
||||||
|
position: fixed;
|
||||||
|
bottom: 32px;
|
||||||
|
left: 50%;
|
||||||
|
transform: translateX(-50%);
|
||||||
|
width: 90%;
|
||||||
|
max-width: 480px;
|
||||||
|
z-index: 10001;
|
||||||
|
transition: all 0.3s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Dark theme styling for the instruction card */
|
||||||
|
.onboarding-info-card {
|
||||||
|
background: rgba(15, 23, 42, 0.9) !important;
|
||||||
|
backdrop-filter: blur(16px) !important;
|
||||||
|
-webkit-backdrop-filter: blur(16px) !important;
|
||||||
|
border: 1px solid rgba(255, 255, 255, 0.08) !important;
|
||||||
|
box-shadow: 0 20px 25px -5px rgba(0, 0, 0, 0.5), 0 10px 10px -5px rgba(0, 0, 0, 0.4) !important;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|
||||||
|
@code {
|
||||||
|
[Parameter] public EventCallback OnFinished { get; set; }
|
||||||
|
|
||||||
|
private bool _active = true;
|
||||||
|
private int _currentStep = 0;
|
||||||
|
|
||||||
|
private readonly List<OnboardingStep> _steps =
|
||||||
|
[
|
||||||
|
new(".onboarding-nav-menu", "Die Navigation", "Hier auf der linken Seite findest du das Hauptmenü. Du kannst ganz einfach zwischen der Wochen- und Monatsübersicht wechseln oder deine Statistiken einsehen."),
|
||||||
|
new(".onboarding-week-header", "Kalenderwoche blättern", "Hier siehst du die aktuell ausgewählte Woche. Verwende die Pfeiltasten links und rechts, um in vergangenen oder zukünftigen Wochen deine Zeiten zu erfassen."),
|
||||||
|
new(".onboarding-day-card", "Zeiterfassung pro Tag", "Das Herzstück des Timetrackers. Trage hier deine täglichen Start- und Endzeiten sowie deine Pausen ein. Das System errechnet die Zeiten und Überstunden in Echtzeit."),
|
||||||
|
new(".onboarding-week-summary", "Wochenzusammenfassung", "Hier siehst du auf einen Blick, wie viele Stunden du in dieser Woche gearbeitet hast, wie viel Pause du gemacht hast und wie sich dein Stundensaldo verändert hat."),
|
||||||
|
new(".onboarding-overtime-balance", "Gleitzeitkonto", "Hier wird dein gesamtes Gleitzeitkonto über das Jahr hinweg zusammengerechnet. So weißt du immer genau, wie viele Überstunden du angesammelt hast.")
|
||||||
|
];
|
||||||
|
|
||||||
|
protected override async Task OnAfterRenderAsync(bool firstRender)
|
||||||
|
{
|
||||||
|
if (firstRender)
|
||||||
|
{
|
||||||
|
await HighlightStep();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task HighlightStep()
|
||||||
|
{
|
||||||
|
if (_active && _steps.Count > 0)
|
||||||
|
{
|
||||||
|
var step = _steps[_currentStep];
|
||||||
|
await JS.InvokeVoidAsync("window.onboarding.highlight", step.TargetSelector);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task NextStep()
|
||||||
|
{
|
||||||
|
if (_currentStep < _steps.Count - 1)
|
||||||
|
{
|
||||||
|
_currentStep++;
|
||||||
|
await HighlightStep();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
await CompleteTour();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task PrevStep()
|
||||||
|
{
|
||||||
|
if (_currentStep > 0)
|
||||||
|
{
|
||||||
|
_currentStep--;
|
||||||
|
await HighlightStep();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task CompleteTour()
|
||||||
|
{
|
||||||
|
_active = false;
|
||||||
|
await JS.InvokeVoidAsync("window.onboarding.clear");
|
||||||
|
await OnFinished.InvokeAsync();
|
||||||
|
}
|
||||||
|
|
||||||
|
private class OnboardingStep
|
||||||
|
{
|
||||||
|
public string TargetSelector { get; }
|
||||||
|
public string Title { get; }
|
||||||
|
public string Content { get; }
|
||||||
|
|
||||||
|
public OnboardingStep(string targetSelector, string title, string content)
|
||||||
|
{
|
||||||
|
TargetSelector = targetSelector;
|
||||||
|
Title = title;
|
||||||
|
Content = content;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+54
-6
@@ -1,10 +1,13 @@
|
|||||||
@page "/settings"
|
@page "/settings"
|
||||||
@rendermode InteractiveServer
|
@rendermode InteractiveWebAssembly
|
||||||
@attribute [Authorize]
|
@attribute [Authorize]
|
||||||
@inject TimetrackerService TrackerService
|
@inject ITimetrackerService TrackerService
|
||||||
@inject HolidayService HolidayService
|
@inject IHolidayService HolidayService
|
||||||
@inject ISnackbar Snackbar
|
@inject ISnackbar Snackbar
|
||||||
@inject AuthenticationStateProvider AuthStateProvider
|
@inject AuthenticationStateProvider AuthStateProvider
|
||||||
|
@inject IJSRuntime JSRuntime
|
||||||
|
@inject NavigationManager Nav
|
||||||
|
|
||||||
|
|
||||||
<PageTitle>Einstellungen – Timetracker</PageTitle>
|
<PageTitle>Einstellungen – Timetracker</PageTitle>
|
||||||
|
|
||||||
@@ -20,7 +23,7 @@ else
|
|||||||
|
|
||||||
@* ── Header ── *@
|
@* ── Header ── *@
|
||||||
<MudPaper Elevation="4" Class="pa-5 rounded-xl"
|
<MudPaper Elevation="4" Class="pa-5 rounded-xl"
|
||||||
Style="background: linear-gradient(135deg, #3F51B5 0%, #1A237E 100%); color:white;">
|
Style="background: #1E293B; color:white;">
|
||||||
<MudStack Row="true" AlignItems="AlignItems.Center" Spacing="3">
|
<MudStack Row="true" AlignItems="AlignItems.Center" Spacing="3">
|
||||||
<MudIcon Icon="@Icons.Material.Filled.Settings" Style="color:white; font-size:2rem" />
|
<MudIcon Icon="@Icons.Material.Filled.Settings" Style="color:white; font-size:2rem" />
|
||||||
<MudStack Spacing="0">
|
<MudStack Spacing="0">
|
||||||
@@ -187,6 +190,33 @@ else
|
|||||||
</MudCard>
|
</MudCard>
|
||||||
</MudItem>
|
</MudItem>
|
||||||
|
|
||||||
|
@* ── Hilfe & Einführung ── *@
|
||||||
|
<MudItem xs="12" md="6">
|
||||||
|
<MudCard Elevation="3" Class="rounded-xl h-100">
|
||||||
|
<MudCardHeader>
|
||||||
|
<CardHeaderContent>
|
||||||
|
<MudStack Row="true" AlignItems="AlignItems.Center" Spacing="2">
|
||||||
|
<MudIcon Icon="@Icons.Material.Filled.HelpOutline" Color="Color.Primary" />
|
||||||
|
<MudText Typo="Typo.h6" Style="font-weight:600">Hilfe & Einführung</MudText>
|
||||||
|
</MudStack>
|
||||||
|
</CardHeaderContent>
|
||||||
|
</MudCardHeader>
|
||||||
|
<MudCardContent>
|
||||||
|
<MudStack Spacing="4">
|
||||||
|
<MudText Typo="Typo.body2" Color="Color.Secondary">
|
||||||
|
Wenn du die interaktive Einführung (Onboarding Tour) noch einmal sehen möchtest, kannst du sie hier zurücksetzen und neu starten.
|
||||||
|
</MudText>
|
||||||
|
<MudButton Variant="Variant.Outlined" Color="Color.Primary"
|
||||||
|
StartIcon="@Icons.Material.Filled.PlayCircleOutline"
|
||||||
|
OnClick="RepeatOnboarding"
|
||||||
|
Style="max-width:250px;">
|
||||||
|
Onboarding wiederholen
|
||||||
|
</MudButton>
|
||||||
|
</MudStack>
|
||||||
|
</MudCardContent>
|
||||||
|
</MudCard>
|
||||||
|
</MudItem>
|
||||||
|
|
||||||
</MudGrid>
|
</MudGrid>
|
||||||
|
|
||||||
@* ── Speichern-Button ── *@
|
@* ── Speichern-Button ── *@
|
||||||
@@ -495,8 +525,12 @@ else
|
|||||||
if (claim == null) return;
|
if (claim == null) return;
|
||||||
_userId = int.Parse(claim.Value);
|
_userId = int.Parse(claim.Value);
|
||||||
_settings = await TrackerService.GetSettingsAsync(_userId);
|
_settings = await TrackerService.GetSettingsAsync(_userId);
|
||||||
await LoadVacations();
|
|
||||||
_holHolidays = await HolidayService.GetHolidaysAsync(_holYear, _settings.GermanState);
|
var loadVacationsTask = LoadVacations();
|
||||||
|
var loadHolidaysTask = HolidayService.GetHolidaysAsync(_holYear, _settings.GermanState);
|
||||||
|
|
||||||
|
await Task.WhenAll(loadVacationsTask, loadHolidaysTask);
|
||||||
|
_holHolidays = await loadHolidaysTask;
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task LoadVacations()
|
private async Task LoadVacations()
|
||||||
@@ -574,6 +608,20 @@ else
|
|||||||
Snackbar.Add("Feiertag entfernt", Severity.Info);
|
Snackbar.Add("Feiertag entfernt", Severity.Info);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async Task RepeatOnboarding()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await JSRuntime.InvokeVoidAsync("localStorage.setItem", "showOnboarding", "true");
|
||||||
|
Snackbar.Add("Onboarding zurückgesetzt. Leite weiter zur Startseite...", Severity.Info);
|
||||||
|
Nav.NavigateTo("/");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Snackbar.Add($"Fehler beim Zurücksetzen des Onboardings: {ex.Message}", Severity.Error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private static string FormatHours(double hours)
|
private static string FormatHours(double hours)
|
||||||
{
|
{
|
||||||
var ts = TimeSpan.FromHours(hours);
|
var ts = TimeSpan.FromHours(hours);
|
||||||
@@ -0,0 +1,382 @@
|
|||||||
|
@page "/stats"
|
||||||
|
@rendermode InteractiveWebAssembly
|
||||||
|
@attribute [Authorize]
|
||||||
|
@inject ITimetrackerService TrackerService
|
||||||
|
@inject AuthenticationStateProvider AuthStateProvider
|
||||||
|
@using System.Security.Claims
|
||||||
|
@using timetracker.Shared
|
||||||
|
|
||||||
|
<PageTitle>Statistiken – Timetracker</PageTitle>
|
||||||
|
|
||||||
|
@if (_loading)
|
||||||
|
{
|
||||||
|
<MudStack AlignItems="AlignItems.Center" Class="mt-16" Spacing="3">
|
||||||
|
<MudProgressCircular Color="Color.Primary" Indeterminate="true" Size="Size.Large" />
|
||||||
|
<MudText Color="Color.Secondary">Lade Statistiken…</MudText>
|
||||||
|
</MudStack>
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
<MudStack Spacing="4">
|
||||||
|
|
||||||
|
@* ── Header ── *@
|
||||||
|
<MudPaper Elevation="4" Class="pa-5 rounded-xl" Style="background: #1E293B; color: white;">
|
||||||
|
<MudStack Row="true" AlignItems="AlignItems.Center" Spacing="3">
|
||||||
|
<MudIcon Icon="@Icons.Material.Filled.BarChart" Style="color:white; font-size:2.2rem" />
|
||||||
|
<MudStack Spacing="0">
|
||||||
|
<MudText Typo="Typo.h5" Style="color:white; font-weight:700">Statistiken</MudText>
|
||||||
|
<MudText Typo="Typo.caption" Style="color:rgba(255,255,255,0.72)">Auswertung deiner Arbeitsleistung und Gleitzeitkonto</MudText>
|
||||||
|
</MudStack>
|
||||||
|
</MudStack>
|
||||||
|
</MudPaper>
|
||||||
|
|
||||||
|
<MudGrid Spacing="4">
|
||||||
|
@* ── Card 1: Wochen-Fortschritt ── *@
|
||||||
|
<MudItem xs="12" md="4">
|
||||||
|
<MudCard Elevation="3" Class="rounded-xl" Style="height:100%;">
|
||||||
|
<MudCardContent>
|
||||||
|
<MudStack AlignItems="AlignItems.Center" Spacing="3">
|
||||||
|
<MudText Typo="Typo.subtitle1" Style="font-weight:700; color:#475569">Wochenfortschritt</MudText>
|
||||||
|
|
||||||
|
@{
|
||||||
|
var pct = _weekTargetHours > 0 ? (int)Math.Min((_weekWorkedHours / _weekTargetHours) * 100, 100) : 0;
|
||||||
|
var displayPct = _weekTargetHours > 0 ? (int)Math.Round((_weekWorkedHours / _weekTargetHours) * 100) : 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
<div style="position:relative; display:inline-flex;">
|
||||||
|
<MudProgressCircular Value="@pct" Color="Color.Secondary" Size="Size.Large" StrokeWidth="6" Style="height:120px; width:120px;" />
|
||||||
|
<div style="position:absolute; top:0; left:0; bottom:0; right:0; display:flex; align-items:center; justify-content:center; flex-direction:column;">
|
||||||
|
<MudText Typo="Typo.h5" Style="font-weight:800; color:#0F172A;">@displayPct%</MudText>
|
||||||
|
<MudText Typo="Typo.caption" Color="Color.Secondary">Erreicht</MudText>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<MudStack Spacing="1" Style="width:100%;" Class="mt-2">
|
||||||
|
<MudStack Row="true" Justify="Justify.SpaceBetween">
|
||||||
|
<MudText Typo="Typo.body2" Color="Color.Secondary">Arbeitszeit (Ist):</MudText>
|
||||||
|
<MudText Typo="Typo.body2" Style="font-weight:700; color:#0F172A">@FormatHours(_weekWorkedHours) Std.</MudText>
|
||||||
|
</MudStack>
|
||||||
|
<MudStack Row="true" Justify="Justify.SpaceBetween">
|
||||||
|
<MudText Typo="Typo.body2" Color="Color.Secondary">Wochensoll (Soll):</MudText>
|
||||||
|
<MudText Typo="Typo.body2" Style="font-weight:700">@FormatHours(_weekTargetHours) Std.</MudText>
|
||||||
|
</MudStack>
|
||||||
|
</MudStack>
|
||||||
|
</MudStack>
|
||||||
|
</MudCardContent>
|
||||||
|
</MudCard>
|
||||||
|
</MudItem>
|
||||||
|
|
||||||
|
@* ── Card 2: Wochensaldo ── *@
|
||||||
|
<MudItem xs="12" sm="6" md="4">
|
||||||
|
<MudCard Elevation="3" Class="rounded-xl" Style="height:100%; border-left: 6px solid #0EA5E9;">
|
||||||
|
<MudCardContent>
|
||||||
|
<MudStack Spacing="2">
|
||||||
|
<MudText Typo="Typo.subtitle1" Style="font-weight:700; color:#475569">Wochensaldo</MudText>
|
||||||
|
|
||||||
|
<MudStack Row="true" AlignItems="AlignItems.Center" Class="py-3">
|
||||||
|
<MudIcon Icon="@(_weekOvertimeHours >= 0 ? Icons.Material.Filled.TrendingUp : Icons.Material.Filled.TrendingDown)"
|
||||||
|
Style="@($"color:{(_weekOvertimeHours >= 0 ? "#10B981" : "#EF4444")}; font-size:3rem")" />
|
||||||
|
<MudStack Spacing="0">
|
||||||
|
<MudText Typo="Typo.h3" Style="@($"font-weight:800; color:{(_weekOvertimeHours >= 0 ? "#10B981" : "#EF4444")};")">
|
||||||
|
@FormatTs(TimeSpan.FromHours(_weekOvertimeHours), sign: true)
|
||||||
|
</MudText>
|
||||||
|
<MudText Typo="Typo.caption" Color="Color.Secondary">Überstunden-Veränderung diese Woche</MudText>
|
||||||
|
</MudStack>
|
||||||
|
</MudStack>
|
||||||
|
</MudStack>
|
||||||
|
</MudCardContent>
|
||||||
|
</MudCard>
|
||||||
|
</MudItem>
|
||||||
|
|
||||||
|
@* ── Card 3: Gesamtsaldo ── *@
|
||||||
|
<MudItem xs="12" sm="6" md="4">
|
||||||
|
<MudCard Elevation="3" Class="rounded-xl" Style="@($"height:100%; border-left: 6px solid {(_totalOvertime >= TimeSpan.Zero ? "#10B981" : "#EF4444")};")">
|
||||||
|
<MudCardContent>
|
||||||
|
<MudStack Spacing="2">
|
||||||
|
<MudText Typo="Typo.subtitle1" Style="font-weight:700; color:#475569">Gleitzeitkonto</MudText>
|
||||||
|
|
||||||
|
<MudStack Row="true" AlignItems="AlignItems.Center" Class="py-3">
|
||||||
|
<MudIcon Icon="Icons.Material.Filled.AccountBalance"
|
||||||
|
Style="@($"color:{(_totalOvertime >= TimeSpan.Zero ? "#10B981" : "#EF4444")}; font-size:3rem")" />
|
||||||
|
<MudStack Spacing="0">
|
||||||
|
<MudText Typo="Typo.h3" Style="@($"font-weight:800; color:{(_totalOvertime >= TimeSpan.Zero ? "#10B981" : "#EF4444")};")">
|
||||||
|
@FormatTs(_totalOvertime, sign: true)
|
||||||
|
</MudText>
|
||||||
|
<MudText Typo="Typo.caption" Color="Color.Secondary">Gesamtsaldo aller erfassten Tage</MudText>
|
||||||
|
</MudStack>
|
||||||
|
</MudStack>
|
||||||
|
</MudStack>
|
||||||
|
</MudCardContent>
|
||||||
|
</MudCard>
|
||||||
|
</MudItem>
|
||||||
|
|
||||||
|
@* ── Säulendiagramm (Tagesverteilung) ── *@
|
||||||
|
<MudItem xs="12">
|
||||||
|
<MudCard Elevation="3" Class="rounded-xl">
|
||||||
|
<MudCardHeader>
|
||||||
|
<CardHeaderContent>
|
||||||
|
<MudText Typo="Typo.h6" Style="font-weight:700; color:#0F172A">Arbeitszeitverteilung diese Woche</MudText>
|
||||||
|
<MudText Typo="Typo.caption" Color="Color.Secondary">Geleistete Nettoarbeitsstunden pro Wochentag</MudText>
|
||||||
|
</CardHeaderContent>
|
||||||
|
</MudCardHeader>
|
||||||
|
<MudCardContent>
|
||||||
|
<div class="chart-container" style="width:100%; overflow-x:auto;">
|
||||||
|
<svg viewBox="0 0 640 320" width="100%" height="320" style="min-width: 500px; display: block; overflow: visible;">
|
||||||
|
<style>
|
||||||
|
.chart-bar {
|
||||||
|
transition: height 0.4s ease, y 0.4s ease, fill 0.3s;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
.chart-bar:hover {
|
||||||
|
filter: brightness(1.1) drop-shadow(0px 4px 8px rgba(14, 165, 233, 0.3));
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|
||||||
|
@{
|
||||||
|
double plotLeft = 50;
|
||||||
|
double plotRight = 580;
|
||||||
|
double plotTop = 30;
|
||||||
|
double plotBottom = 270;
|
||||||
|
double plotWidth = plotRight - plotLeft;
|
||||||
|
double plotHeight = plotBottom - plotTop;
|
||||||
|
double barWidth = 36;
|
||||||
|
double spacing = plotWidth / 7;
|
||||||
|
}
|
||||||
|
|
||||||
|
<!-- Horizontal Grid Lines -->
|
||||||
|
@for (int i = 0; i <= 4; i++)
|
||||||
|
{
|
||||||
|
double val = (_maxHoursValue / 4.0) * i;
|
||||||
|
double yPos = plotBottom - (val / _maxHoursValue) * plotHeight;
|
||||||
|
<line x1="@plotLeft" y1="@yPos" x2="@plotRight" y2="@yPos" stroke="#E2E8F0" stroke-width="1" stroke-dasharray="2" />
|
||||||
|
@((MarkupString)$"<text x=\"{plotLeft - 8}\" y=\"{yPos + 4}\" fill=\"#64748B\" font-size=\"11\" font-weight=\"500\" text-anchor=\"end\">{val:F1}h</text>")
|
||||||
|
}
|
||||||
|
|
||||||
|
<!-- Bars and Labels -->
|
||||||
|
@for (int i = 0; i < 7; i++)
|
||||||
|
{
|
||||||
|
var d = _days[i];
|
||||||
|
double xPos = plotLeft + (i * spacing) + (spacing - barWidth) / 2;
|
||||||
|
double bHeight = (d.WorkedHours / _maxHoursValue) * plotHeight;
|
||||||
|
double yPos = plotBottom - bHeight;
|
||||||
|
|
||||||
|
string fillCol = "#94A3B8"; // Default light slate
|
||||||
|
if (d.IsToday)
|
||||||
|
{
|
||||||
|
fillCol = "#0EA5E9"; // Sky Blue for today
|
||||||
|
}
|
||||||
|
else if (d.WorkedHours >= d.TargetHours && d.TargetHours > 0)
|
||||||
|
{
|
||||||
|
fillCol = "#475569"; // Slate Blue for normal completed target
|
||||||
|
}
|
||||||
|
else if (d.WorkedHours > 0 && d.TargetHours == 0)
|
||||||
|
{
|
||||||
|
fillCol = "#10B981"; // Emerald Green for weekend work (pure overtime)
|
||||||
|
}
|
||||||
|
else if (d.WorkedHours > 0)
|
||||||
|
{
|
||||||
|
fillCol = "#64748B"; // Slate Medium for incomplete target
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
fillCol = "#E2E8F0"; // Very light grey for zero hours
|
||||||
|
}
|
||||||
|
|
||||||
|
<!-- Render Rect with hover tooltip -->
|
||||||
|
<rect x="@xPos" y="@(d.WorkedHours > 0 ? yPos : plotBottom - 4)" width="@barWidth" height="@(d.WorkedHours > 0 ? bHeight : 4)"
|
||||||
|
rx="6" fill="@fillCol" class="chart-bar">
|
||||||
|
<title>@d.DayName: @FormatHours(d.WorkedHours) Std. (Soll: @FormatHours(d.TargetHours) Std.)</title>
|
||||||
|
</rect>
|
||||||
|
|
||||||
|
<!-- Value Label above bar -->
|
||||||
|
@if (d.WorkedHours > 0)
|
||||||
|
{
|
||||||
|
@((MarkupString)$"<text x=\"{xPos + barWidth / 2}\" y=\"{yPos - 6}\" fill=\"#0F172A\" font-size=\"11\" font-weight=\"700\" text-anchor=\"middle\">{FormatHours(d.WorkedHours)}</text>")
|
||||||
|
}
|
||||||
|
|
||||||
|
<!-- Wochentag Text -->
|
||||||
|
@((MarkupString)$"<text x=\"{xPos + barWidth / 2}\" y=\"{plotBottom + 20}\" fill=\"#64748B\" font-size=\"11\" font-weight=\"700\" text-anchor=\"middle\">{d.DayShortName}</text>")
|
||||||
|
}
|
||||||
|
|
||||||
|
<!-- Sollzeit Target Line (Only if target hours > 0) -->
|
||||||
|
@if (_settings.DailyTargetHours > 0)
|
||||||
|
{
|
||||||
|
double yTarget = plotBottom - (_settings.DailyTargetHours / _maxHoursValue) * plotHeight;
|
||||||
|
<line x1="@plotLeft" y1="@yTarget" x2="@plotRight" y2="@yTarget" stroke="#EF4444" stroke-width="2" stroke-dasharray="4" style="opacity: 0.75;" />
|
||||||
|
@((MarkupString)$"<text x=\"{plotRight - 10}\" y=\"{yTarget - 6}\" fill=\"#EF4444\" font-size=\"10\" font-weight=\"700\" text-anchor=\"end\">Soll ({_settings.DailyTargetHours} h)</text>")
|
||||||
|
}
|
||||||
|
</svg>
|
||||||
|
</div>
|
||||||
|
</MudCardContent>
|
||||||
|
</MudCard>
|
||||||
|
</MudItem>
|
||||||
|
|
||||||
|
@* ── Diagnostics Panel ── *@
|
||||||
|
<MudItem xs="12">
|
||||||
|
<MudExpansionPanels>
|
||||||
|
<MudExpansionPanel Text="Diagnose-Daten (Debug)">
|
||||||
|
<MudText Typo="Typo.body2">Benutzer-ID: @_userId</MudText>
|
||||||
|
<MudText Typo="Typo.body2">Wochensoll: @_weekTargetHours Std. | Netto-Arbeitszeit: @_weekWorkedHours Std. | Wochensaldo: @_weekOvertimeHours Std.</MudText>
|
||||||
|
<MudText Typo="Typo.body2">Anzahl erfasste Tage aus DB: @_rawDbDaysCount</MudText>
|
||||||
|
|
||||||
|
<MudSimpleTable Style="margin-top: 10px;">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>Datum</th>
|
||||||
|
<th>Tag</th>
|
||||||
|
<th>Ist (Std)</th>
|
||||||
|
<th>Soll (Std)</th>
|
||||||
|
<th>Ist > 0</th>
|
||||||
|
<th>Arbeitstag (Einst.)</th>
|
||||||
|
<th>Aus DB zugeordnet</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
@foreach (var d in _days)
|
||||||
|
{
|
||||||
|
<tr>
|
||||||
|
<td>@d.Date.ToString("yyyy-MM-dd")</td>
|
||||||
|
<td>@d.DayName</td>
|
||||||
|
<td>@d.WorkedHours</td>
|
||||||
|
<td>@d.TargetHours</td>
|
||||||
|
<td>@(d.WorkedHours > 0 ? "Ja" : "Nein")</td>
|
||||||
|
<td>@(d.IsWorkDay ? "Ja" : "Nein")</td>
|
||||||
|
<td>@(_dbMatchStatus.GetValueOrDefault(d.Date, "Nein"))</td>
|
||||||
|
</tr>
|
||||||
|
}
|
||||||
|
</tbody>
|
||||||
|
</MudSimpleTable>
|
||||||
|
</MudExpansionPanel>
|
||||||
|
</MudExpansionPanels>
|
||||||
|
</MudItem>
|
||||||
|
</MudGrid>
|
||||||
|
</MudStack>
|
||||||
|
}
|
||||||
|
|
||||||
|
@code {
|
||||||
|
private bool _loading = true;
|
||||||
|
private int _userId;
|
||||||
|
private AppSettings _settings = new();
|
||||||
|
private List<DayStat> _days = [];
|
||||||
|
private TimeSpan _totalOvertime;
|
||||||
|
private double _weekWorkedHours;
|
||||||
|
private double _weekTargetHours;
|
||||||
|
private double _weekOvertimeHours;
|
||||||
|
private double _maxHoursValue = 10.0;
|
||||||
|
|
||||||
|
// Debug variables
|
||||||
|
private int _rawDbDaysCount = 0;
|
||||||
|
private Dictionary<DateOnly, string> _dbMatchStatus = new();
|
||||||
|
|
||||||
|
private static readonly System.Globalization.CultureInfo _deCulture = new("de-DE");
|
||||||
|
|
||||||
|
protected override async Task OnInitializedAsync()
|
||||||
|
{
|
||||||
|
var authState = await AuthStateProvider.GetAuthenticationStateAsync();
|
||||||
|
var claim = authState.User.FindFirst(ClaimTypes.NameIdentifier);
|
||||||
|
if (claim == null) return;
|
||||||
|
_userId = int.Parse(claim.Value);
|
||||||
|
|
||||||
|
_settings = await TrackerService.GetSettingsAsync(_userId);
|
||||||
|
|
||||||
|
var today = DateOnly.FromDateTime(DateTime.Today);
|
||||||
|
var monday = GetMonday(today);
|
||||||
|
|
||||||
|
var dbDays = await TrackerService.GetWeekAsync(_userId, monday);
|
||||||
|
_rawDbDaysCount = dbDays.Count;
|
||||||
|
_totalOvertime = await TrackerService.GetTotalOvertimeAsync(_userId, _settings);
|
||||||
|
|
||||||
|
_weekTargetHours = 0;
|
||||||
|
_weekWorkedHours = 0;
|
||||||
|
_dbMatchStatus.Clear();
|
||||||
|
|
||||||
|
_days = Enumerable.Range(0, 7).Select(i =>
|
||||||
|
{
|
||||||
|
var date = monday.AddDays(i);
|
||||||
|
bool isWorkDay = _settings.IsWorkDay(date.DayOfWeek);
|
||||||
|
double target = isWorkDay ? _settings.DailyTargetHours : 0.0;
|
||||||
|
|
||||||
|
if (isWorkDay)
|
||||||
|
{
|
||||||
|
_weekTargetHours += _settings.DailyTargetHours;
|
||||||
|
}
|
||||||
|
|
||||||
|
var wd = dbDays.FirstOrDefault(d => d.Date == date);
|
||||||
|
double worked = 0.0;
|
||||||
|
|
||||||
|
if (wd != null)
|
||||||
|
{
|
||||||
|
_dbMatchStatus[date] = $"Ja (Id={wd.Id}, Start={wd.StartTime}, Ende={wd.EndTime})";
|
||||||
|
|
||||||
|
if (wd.StartTime != null && wd.EndTime != null)
|
||||||
|
{
|
||||||
|
var gross = wd.EndTime.Value.ToTimeSpan() - wd.StartTime.Value.ToTimeSpan();
|
||||||
|
if (gross > TimeSpan.Zero)
|
||||||
|
{
|
||||||
|
var breakTotal = wd.Breaks
|
||||||
|
.Where(b => b.StartTime.HasValue && b.EndTime.HasValue && b.EndTime > b.StartTime)
|
||||||
|
.Aggregate(TimeSpan.Zero, (s, b) =>
|
||||||
|
s + (b.EndTime!.Value.ToTimeSpan() - b.StartTime!.Value.ToTimeSpan()));
|
||||||
|
worked = (gross - breakTotal).TotalHours;
|
||||||
|
if (worked < 0) worked = 0.0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_dbMatchStatus[date] = "Nein";
|
||||||
|
}
|
||||||
|
|
||||||
|
_weekWorkedHours += worked;
|
||||||
|
|
||||||
|
return new DayStat
|
||||||
|
{
|
||||||
|
Date = date,
|
||||||
|
DayName = date.ToString("dddd", _deCulture),
|
||||||
|
DayShortName = date.ToString("ddd", _deCulture),
|
||||||
|
WorkedHours = worked,
|
||||||
|
TargetHours = target,
|
||||||
|
IsToday = date == today,
|
||||||
|
IsWorkDay = isWorkDay
|
||||||
|
};
|
||||||
|
}).ToList();
|
||||||
|
|
||||||
|
_weekOvertimeHours = _weekWorkedHours - _weekTargetHours;
|
||||||
|
|
||||||
|
var maxWorked = _days.Max(d => d.WorkedHours);
|
||||||
|
_maxHoursValue = Math.Max(10.0, Math.Max(maxWorked, _settings.DailyTargetHours));
|
||||||
|
|
||||||
|
_loading = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static DateOnly GetMonday(DateOnly date)
|
||||||
|
{
|
||||||
|
int diff = ((int)date.DayOfWeek - (int)DayOfWeek.Monday + 7) % 7;
|
||||||
|
return date.AddDays(-diff);
|
||||||
|
}
|
||||||
|
|
||||||
|
private string FormatHours(double hours)
|
||||||
|
{
|
||||||
|
var ts = TimeSpan.FromHours(hours);
|
||||||
|
return $"{(int)ts.TotalHours}:{ts.Minutes:D2}";
|
||||||
|
}
|
||||||
|
|
||||||
|
private string FormatTs(TimeSpan ts, bool sign = false)
|
||||||
|
{
|
||||||
|
if (ts == TimeSpan.Zero && sign) return "±0:00";
|
||||||
|
var prefix = sign ? (ts >= TimeSpan.Zero ? "+" : "−") : (ts < TimeSpan.Zero ? "−" : "");
|
||||||
|
var abs = ts.Duration();
|
||||||
|
return $"{prefix}{(int)abs.TotalHours}:{abs.Minutes:D2}";
|
||||||
|
}
|
||||||
|
|
||||||
|
private sealed class DayStat
|
||||||
|
{
|
||||||
|
public DateOnly Date { get; set; }
|
||||||
|
public string DayName { get; set; } = "";
|
||||||
|
public string DayShortName { get; set; } = "";
|
||||||
|
public double WorkedHours { get; set; }
|
||||||
|
public double TargetHours { get; set; }
|
||||||
|
public bool IsToday { get; set; }
|
||||||
|
public bool IsWorkDay { get; set; }
|
||||||
|
}
|
||||||
|
}
|
||||||
+11
-6
@@ -1,8 +1,8 @@
|
|||||||
@page "/urlaub-maximizer"
|
@page "/urlaub-maximizer"
|
||||||
@rendermode InteractiveServer
|
@rendermode InteractiveWebAssembly
|
||||||
@attribute [Authorize]
|
@attribute [Authorize]
|
||||||
@inject TimetrackerService TrackerService
|
@inject ITimetrackerService TrackerService
|
||||||
@inject HolidayService HolidayService
|
@inject IHolidayService HolidayService
|
||||||
@inject ISnackbar Snackbar
|
@inject ISnackbar Snackbar
|
||||||
@inject AuthenticationStateProvider AuthStateProvider
|
@inject AuthenticationStateProvider AuthStateProvider
|
||||||
|
|
||||||
@@ -21,7 +21,7 @@ else
|
|||||||
|
|
||||||
@* ── Header ── *@
|
@* ── Header ── *@
|
||||||
<MudPaper Elevation="4" Class="pa-5 rounded-xl"
|
<MudPaper Elevation="4" Class="pa-5 rounded-xl"
|
||||||
Style="background: linear-gradient(135deg, #F57F17 0%, #E65100 100%); color:white;">
|
Style="background: #C2410C; color:white;">
|
||||||
<MudStack Row="true" AlignItems="AlignItems.Center" Justify="Justify.SpaceBetween">
|
<MudStack Row="true" AlignItems="AlignItems.Center" Justify="Justify.SpaceBetween">
|
||||||
<MudIconButton Icon="@Icons.Material.Filled.ChevronLeft"
|
<MudIconButton Icon="@Icons.Material.Filled.ChevronLeft"
|
||||||
Style="color:white" Size="Size.Large" OnClick="PrevYear" />
|
Style="color:white" Size="Size.Large" OnClick="PrevYear" />
|
||||||
@@ -249,8 +249,13 @@ else
|
|||||||
|
|
||||||
private async Task LoadYear()
|
private async Task LoadYear()
|
||||||
{
|
{
|
||||||
var holidays = await HolidayService.GetHolidaysAsync(_year, _settings.GermanState);
|
var holidaysTask = HolidayService.GetHolidaysAsync(_year, _settings.GermanState);
|
||||||
var vacations = await TrackerService.GetVacationDaysAsync(_userId, _year);
|
var vacationsTask = TrackerService.GetVacationDaysAsync(_userId, _year);
|
||||||
|
|
||||||
|
await Task.WhenAll(holidaysTask, vacationsTask);
|
||||||
|
|
||||||
|
var holidays = await holidaysTask;
|
||||||
|
var vacations = await vacationsTask;
|
||||||
_holidays = holidays.ToDictionary(h => h.Date, h => h.Name);
|
_holidays = holidays.ToDictionary(h => h.Date, h => h.Name);
|
||||||
_vacationSet = vacations.Select(v => v.Date).ToHashSet();
|
_vacationSet = vacations.Select(v => v.Date).ToHashSet();
|
||||||
_remainingDays = Math.Max(0, _settings.VacationDaysPerYear - vacations.Count);
|
_remainingDays = Math.Max(0, _settings.VacationDaysPerYear - vacations.Count);
|
||||||
@@ -1,10 +1,10 @@
|
|||||||
@rendermode InteractiveServer
|
@rendermode InteractiveWebAssembly
|
||||||
|
|
||||||
<Router AppAssembly="typeof(Program).Assembly" NotFoundPage="typeof(Pages.NotFound)">
|
<Router AppAssembly="typeof(timetracker.Client._Imports).Assembly">
|
||||||
<Found Context="routeData">
|
<Found Context="routeData">
|
||||||
<AuthorizeRouteView RouteData="routeData" DefaultLayout="typeof(Layout.MainLayout)">
|
<AuthorizeRouteView RouteData="routeData" DefaultLayout="typeof(timetracker.Client.Components.Layout.MainLayout)">
|
||||||
<NotAuthorized>
|
<NotAuthorized>
|
||||||
<RedirectToLogin />
|
<timetracker.Client.Components.RedirectToLogin />
|
||||||
</NotAuthorized>
|
</NotAuthorized>
|
||||||
</AuthorizeRouteView>
|
</AuthorizeRouteView>
|
||||||
<FocusOnNavigate RouteData="routeData" Selector="h1" />
|
<FocusOnNavigate RouteData="routeData" Selector="h1" />
|
||||||
@@ -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
|
||||||
@@ -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<HostAuthenticationStateProvider>();
|
||||||
|
builder.Services.AddScoped<AuthenticationStateProvider>(sp => sp.GetRequiredService<HostAuthenticationStateProvider>());
|
||||||
|
|
||||||
|
builder.Services.AddScoped<IAuthService, ClientAuthService>();
|
||||||
|
builder.Services.AddScoped<ITimetrackerService, ClientTimetrackerService>();
|
||||||
|
builder.Services.AddScoped<IHolidayService, ClientHolidayService>();
|
||||||
|
builder.Services.AddScoped<IUserNotificationService, UserNotificationService>();
|
||||||
|
|
||||||
|
await builder.Build().RunAsync();
|
||||||
@@ -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"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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<User?> 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<UserInfo>();
|
||||||
|
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, string? honeypot = null)
|
||||||
|
{
|
||||||
|
var response = await _http.PostAsJsonAsync("api/auth/register", new { Username = username, Password = password, Honeypot = honeypot });
|
||||||
|
if (response.IsSuccessStatusCode)
|
||||||
|
{
|
||||||
|
var userInfo = await response.Content.ReadFromJsonAsync<UserInfo>();
|
||||||
|
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<List<User>> GetAllUsersAsync()
|
||||||
|
{
|
||||||
|
return await _http.GetFromJsonAsync<List<User>>("api/users") ?? [];
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task DeleteUserAsync(int userId)
|
||||||
|
{
|
||||||
|
await _http.DeleteAsync($"api/users/{userId}");
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<string?> 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;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,67 @@
|
|||||||
|
using System.Net.Http.Json;
|
||||||
|
using timetracker.Shared;
|
||||||
|
|
||||||
|
namespace timetracker.Client.Services;
|
||||||
|
|
||||||
|
public class ClientHolidayService : IHolidayService
|
||||||
|
{
|
||||||
|
private readonly HttpClient _http;
|
||||||
|
private readonly Dictionary<(int Year, string StateCode), List<PublicHoliday>> _holidayCache = new();
|
||||||
|
|
||||||
|
public ClientHolidayService(HttpClient http)
|
||||||
|
{
|
||||||
|
_http = http;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<List<PublicHoliday>> GetHolidaysAsync(int year, string? stateCode = null)
|
||||||
|
{
|
||||||
|
var sc = stateCode ?? "";
|
||||||
|
var key = (year, sc);
|
||||||
|
if (_holidayCache.TryGetValue(key, out var cached))
|
||||||
|
{
|
||||||
|
return cached;
|
||||||
|
}
|
||||||
|
|
||||||
|
var url = $"api/holidays?year={year}";
|
||||||
|
if (!string.IsNullOrEmpty(stateCode))
|
||||||
|
{
|
||||||
|
url += $"&stateCode={stateCode}";
|
||||||
|
}
|
||||||
|
var result = await _http.GetFromJsonAsync<List<PublicHoliday>>(url) ?? [];
|
||||||
|
_holidayCache[key] = result;
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
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<FetchResponse>();
|
||||||
|
if (result != null)
|
||||||
|
{
|
||||||
|
// Invalidate the cache for this year
|
||||||
|
var keysToRemove = _holidayCache.Keys.Where(k => k.Year == year).ToList();
|
||||||
|
foreach (var k in keysToRemove)
|
||||||
|
{
|
||||||
|
_holidayCache.Remove(k);
|
||||||
|
}
|
||||||
|
return (result.Success, result.Message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return (false, "Fehler beim Abrufen der Feiertage.");
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task DeleteAsync(int id)
|
||||||
|
{
|
||||||
|
await _http.DeleteAsync($"api/holidays/{id}");
|
||||||
|
// Invalidate all caches since we deleted a holiday
|
||||||
|
_holidayCache.Clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
private class FetchResponse
|
||||||
|
{
|
||||||
|
public bool Success { get; set; }
|
||||||
|
public string Message { get; set; } = "";
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,73 @@
|
|||||||
|
using System.Net.Http.Json;
|
||||||
|
using timetracker.Shared;
|
||||||
|
|
||||||
|
namespace timetracker.Client.Services;
|
||||||
|
|
||||||
|
public class ClientTimetrackerService : ITimetrackerService
|
||||||
|
{
|
||||||
|
private readonly HttpClient _http;
|
||||||
|
private AppSettings? _cachedSettings;
|
||||||
|
|
||||||
|
public ClientTimetrackerService(HttpClient http)
|
||||||
|
{
|
||||||
|
_http = http;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<List<WorkDay>> GetWeekAsync(int userId, DateOnly monday)
|
||||||
|
{
|
||||||
|
return await _http.GetFromJsonAsync<List<WorkDay>>($"api/tracker/week?monday={monday:yyyy-MM-dd}") ?? [];
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task UpsertWorkDayAsync(WorkDay workDay)
|
||||||
|
{
|
||||||
|
await _http.PostAsJsonAsync("api/tracker/workday", workDay);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<AppSettings> GetSettingsAsync(int userId)
|
||||||
|
{
|
||||||
|
if (_cachedSettings != null && _cachedSettings.UserId == userId)
|
||||||
|
{
|
||||||
|
return _cachedSettings;
|
||||||
|
}
|
||||||
|
var settings = await _http.GetFromJsonAsync<AppSettings>("api/tracker/settings");
|
||||||
|
_cachedSettings = settings ?? new AppSettings { UserId = userId };
|
||||||
|
return _cachedSettings;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task SaveSettingsAsync(AppSettings settings)
|
||||||
|
{
|
||||||
|
await _http.PostAsJsonAsync("api/tracker/settings", settings);
|
||||||
|
_cachedSettings = settings;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<List<VacationDay>> GetVacationDaysAsync(int userId, int year)
|
||||||
|
{
|
||||||
|
return await _http.GetFromJsonAsync<List<VacationDay>>($"api/tracker/vacation/{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/{id}");
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<TimeSpan> GetTotalOvertimeAsync(int userId, AppSettings settings)
|
||||||
|
{
|
||||||
|
var response = await _http.PostAsJsonAsync("api/tracker/overtime", settings);
|
||||||
|
if (response.IsSuccessStatusCode)
|
||||||
|
{
|
||||||
|
var hours = await response.Content.ReadFromJsonAsync<double>();
|
||||||
|
return TimeSpan.FromHours(hours);
|
||||||
|
}
|
||||||
|
return TimeSpan.Zero;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<List<WorkDay>> GetMonthAsync(int userId, int year, int month)
|
||||||
|
{
|
||||||
|
return await _http.GetFromJsonAsync<List<WorkDay>>($"api/tracker/month?year={year}&month={month}") ?? [];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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<AuthenticationState> 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<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);
|
||||||
|
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)));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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<Task>? OnUsersChanged;
|
||||||
|
public event Func<int, Task>? 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<int>("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();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFramework>net10.0</TargetFramework>
|
||||||
|
<Nullable>enable</Nullable>
|
||||||
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
|
<OverrideHtmlAssetPlaceholders>true</OverrideHtmlAssetPlaceholders>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="10.0.8" />
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.5" />
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.5" PrivateAssets="all" />
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="10.0.8" />
|
||||||
|
<PackageReference Include="MudBlazor" Version="9.4.0" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\timetracker.Shared\timetracker.Shared.csproj" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
</Project>
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 2.6 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 61 KiB |
@@ -0,0 +1,53 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8" />
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||||
|
<base href="/" />
|
||||||
|
<ResourcePreloader />
|
||||||
|
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" />
|
||||||
|
<link rel="stylesheet" href="_content/MudBlazor/MudBlazor.min.css" />
|
||||||
|
<link rel="stylesheet" href="@Assets["app.css"]" />
|
||||||
|
<link rel="stylesheet" href="@Assets["timetracker.Client.styles.css"]" />
|
||||||
|
<ImportMap />
|
||||||
|
<link rel="icon" type="image/svg+xml" href="favicon.svg" />
|
||||||
|
<link rel="alternate icon" type="image/png" href="favicon.png" />
|
||||||
|
<style>
|
||||||
|
.onboarding-active-target {
|
||||||
|
position: relative !important;
|
||||||
|
z-index: 10000 !important;
|
||||||
|
box-shadow: 0 0 0 9999px rgba(15, 23, 42, 0.75), 0 0 15px rgba(14, 165, 233, 0.5) !important;
|
||||||
|
pointer-events: none !important;
|
||||||
|
transition: all 0.3s ease !important;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
<HeadOutlet @rendermode="InteractiveWebAssembly" />
|
||||||
|
</head>
|
||||||
|
|
||||||
|
<body>
|
||||||
|
<Routes />
|
||||||
|
<script src="@Assets["_framework/blazor.web.js"]"></script>
|
||||||
|
<script src="_content/MudBlazor/MudBlazor.min.js"></script>
|
||||||
|
<script>
|
||||||
|
window.onboarding = {
|
||||||
|
highlight: function (selector) {
|
||||||
|
document.querySelectorAll('.onboarding-active-target').forEach(function(el) {
|
||||||
|
el.classList.remove('onboarding-active-target');
|
||||||
|
});
|
||||||
|
var target = document.querySelector(selector);
|
||||||
|
if (target) {
|
||||||
|
target.classList.add('onboarding-active-target');
|
||||||
|
target.scrollIntoView({ behavior: 'smooth', block: 'center' });
|
||||||
|
}
|
||||||
|
},
|
||||||
|
clear: function () {
|
||||||
|
document.querySelectorAll('.onboarding-active-target').forEach(function(el) {
|
||||||
|
el.classList.remove('onboarding-active-target');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
</body>
|
||||||
|
|
||||||
|
</html>
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
@using System.Net.Http
|
@using System.Net.Http
|
||||||
@using System.Net.Http.Json
|
@using System.Net.Http.Json
|
||||||
@using System.Security.Claims
|
@using System.Security.Claims
|
||||||
@using Microsoft.AspNetCore.Authorization
|
@using Microsoft.AspNetCore.Authorization
|
||||||
@@ -10,7 +10,8 @@
|
|||||||
@using Microsoft.AspNetCore.Components.Web.Virtualization
|
@using Microsoft.AspNetCore.Components.Web.Virtualization
|
||||||
@using Microsoft.JSInterop
|
@using Microsoft.JSInterop
|
||||||
@using timetracker
|
@using timetracker
|
||||||
@using timetracker.Components
|
@using timetracker.Client.Components
|
||||||
@using timetracker.Components.Layout
|
@using timetracker.Client.Components.Layout
|
||||||
@using timetracker.Data
|
@using timetracker.Data
|
||||||
|
@using timetracker.Shared
|
||||||
@using MudBlazor
|
@using MudBlazor
|
||||||
@@ -1,10 +1,11 @@
|
|||||||
using System.Security.Cryptography;
|
using System.Security.Cryptography;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using Microsoft.EntityFrameworkCore;
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
using timetracker.Shared;
|
||||||
|
|
||||||
namespace timetracker.Data;
|
namespace timetracker.Data;
|
||||||
|
|
||||||
public class AuthService(IDbContextFactory<TimetrackerDbContext> factory, UserNotificationService notifier)
|
public class AuthService(IDbContextFactory<TimetrackerDbContext> factory, UserNotificationService notifier) : IAuthService
|
||||||
{
|
{
|
||||||
public async Task<User?> LoginAsync(string username, string password)
|
public async Task<User?> LoginAsync(string username, string password)
|
||||||
{
|
{
|
||||||
@@ -54,7 +55,7 @@ public class AuthService(IDbContextFactory<TimetrackerDbContext> factory, UserNo
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<(User? User, string? Error)> RegisterAsync(string username, string password) {
|
public async Task<(User? User, string? Error)> RegisterAsync(string username, string password, string? honeypot = null) {
|
||||||
if (string.IsNullOrWhiteSpace(username) || username.Length < 3)
|
if (string.IsNullOrWhiteSpace(username) || username.Length < 3)
|
||||||
return (null, "Benutzername muss mindestens 3 Zeichen lang sein.");
|
return (null, "Benutzername muss mindestens 3 Zeichen lang sein.");
|
||||||
if (string.IsNullOrWhiteSpace(password) || password.Length < 6)
|
if (string.IsNullOrWhiteSpace(password) || password.Length < 6)
|
||||||
@@ -1,10 +1,11 @@
|
|||||||
using Microsoft.EntityFrameworkCore;
|
using Microsoft.EntityFrameworkCore;
|
||||||
using System.Net.Http.Json;
|
using System.Net.Http.Json;
|
||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
|
using timetracker.Shared;
|
||||||
|
|
||||||
namespace timetracker.Data;
|
namespace timetracker.Data;
|
||||||
|
|
||||||
public class HolidayService(IDbContextFactory<TimetrackerDbContext> factory, HttpClient http)
|
public class HolidayService(IDbContextFactory<TimetrackerDbContext> factory, HttpClient http) : IHolidayService
|
||||||
{
|
{
|
||||||
private const string ApiUrl = "https://date.nager.at/api/v3/PublicHolidays/{0}/DE";
|
private const string ApiUrl = "https://date.nager.at/api/v3/PublicHolidays/{0}/DE";
|
||||||
|
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
using Microsoft.AspNetCore.SignalR;
|
||||||
|
|
||||||
|
namespace timetracker.Data;
|
||||||
|
|
||||||
|
public class NotificationHub : Hub
|
||||||
|
{
|
||||||
|
}
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
using Microsoft.EntityFrameworkCore;
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
using timetracker.Shared;
|
||||||
|
|
||||||
namespace timetracker.Data;
|
namespace timetracker.Data;
|
||||||
|
|
||||||
@@ -1,8 +1,9 @@
|
|||||||
using Microsoft.EntityFrameworkCore;
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
using timetracker.Shared;
|
||||||
|
|
||||||
namespace timetracker.Data;
|
namespace timetracker.Data;
|
||||||
|
|
||||||
public class TimetrackerService(IDbContextFactory<TimetrackerDbContext> factory)
|
public class TimetrackerService(IDbContextFactory<TimetrackerDbContext> factory) : ITimetrackerService
|
||||||
{
|
{
|
||||||
public async Task<List<WorkDay>> GetWeekAsync(int userId, DateOnly monday)
|
public async Task<List<WorkDay>> GetWeekAsync(int userId, DateOnly monday)
|
||||||
{
|
{
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
using Microsoft.AspNetCore.SignalR;
|
||||||
|
using timetracker.Shared;
|
||||||
|
|
||||||
|
namespace timetracker.Data;
|
||||||
|
|
||||||
|
public class UserNotificationService : IUserNotificationService
|
||||||
|
{
|
||||||
|
private readonly IHubContext<NotificationHub> _hubContext;
|
||||||
|
|
||||||
|
public event Func<Task>? OnUsersChanged;
|
||||||
|
public event Func<int, Task>? OnUserDeleted;
|
||||||
|
|
||||||
|
public UserNotificationService(IHubContext<NotificationHub> 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);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,11 +2,22 @@
|
|||||||
FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
|
FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
|
||||||
WORKDIR /src
|
WORKDIR /src
|
||||||
|
|
||||||
# Keine Unterordner mehr beim Kopieren!
|
# Copy project files for restoring dependencies
|
||||||
COPY timetracker.csproj ./
|
COPY timetracker.slnx ./
|
||||||
RUN dotnet restore timetracker.csproj
|
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.slnx
|
||||||
|
|
||||||
|
# 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
|
RUN dotnet publish -c Release -o /app/publish
|
||||||
|
|
||||||
# ── Runtime Stage ─────────────────────────────────────────────────────────────
|
# ── Runtime Stage ─────────────────────────────────────────────────────────────
|
||||||
@@ -14,7 +25,7 @@ FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS final
|
|||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
COPY --from=build /app/publish .
|
COPY --from=build /app/publish .
|
||||||
|
|
||||||
# Verzeichnis für die SQLite-Datenbank
|
# Directory for SQLite database
|
||||||
RUN mkdir -p /data
|
RUN mkdir -p /data
|
||||||
|
|
||||||
ENV ASPNETCORE_HTTP_PORTS=8080
|
ENV ASPNETCORE_HTTP_PORTS=8080
|
||||||
@@ -27,4 +38,4 @@ EXPOSE 8080
|
|||||||
|
|
||||||
VOLUME ["/data"]
|
VOLUME ["/data"]
|
||||||
|
|
||||||
ENTRYPOINT ["dotnet", "timetracker.dll"]
|
ENTRYPOINT ["dotnet", "timetracker.Server.dll"]
|
||||||
@@ -0,0 +1,364 @@
|
|||||||
|
using System.Security.Claims;
|
||||||
|
using System.Threading.RateLimiting;
|
||||||
|
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;
|
||||||
|
options.Cookie.HttpOnly = true;
|
||||||
|
options.Cookie.SameSite = SameSiteMode.Strict;
|
||||||
|
options.Cookie.SecurePolicy = CookieSecurePolicy.SameAsRequest;
|
||||||
|
// 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<UserNotificationService>();
|
||||||
|
builder.Services.AddSingleton<IUserNotificationService>(sp => sp.GetRequiredService<UserNotificationService>());
|
||||||
|
|
||||||
|
// Register DB-backed services as the interfaces
|
||||||
|
builder.Services.AddScoped<IAuthService, AuthService>();
|
||||||
|
builder.Services.AddScoped<ITimetrackerService, TimetrackerService>();
|
||||||
|
builder.Services.AddScoped<IHolidayService, HolidayService>();
|
||||||
|
|
||||||
|
// Add services to the container.
|
||||||
|
builder.Services.AddRazorComponents()
|
||||||
|
.AddInteractiveWebAssemblyComponents();
|
||||||
|
|
||||||
|
builder.Services.AddMudServices();
|
||||||
|
builder.Services.AddHttpClient<HolidayService>();
|
||||||
|
|
||||||
|
builder.Services.AddRateLimiter(options =>
|
||||||
|
{
|
||||||
|
options.RejectionStatusCode = StatusCodes.Status429TooManyRequests;
|
||||||
|
options.AddPolicy("auth-limit", httpContext =>
|
||||||
|
RateLimitPartition.GetFixedWindowLimiter(
|
||||||
|
partitionKey: httpContext.Connection.RemoteIpAddress?.ToString()
|
||||||
|
?? httpContext.Request.Headers["X-Forwarded-For"].ToString()
|
||||||
|
?? "unknown",
|
||||||
|
factory: _ => new FixedWindowRateLimiterOptions
|
||||||
|
{
|
||||||
|
Window = TimeSpan.FromMinutes(1),
|
||||||
|
PermitLimit = 5,
|
||||||
|
QueueLimit = 0
|
||||||
|
}));
|
||||||
|
});
|
||||||
|
|
||||||
|
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<TimetrackerDbContext>(options =>
|
||||||
|
options.UseNpgsql(connectionString));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
var dbPath = Environment.GetEnvironmentVariable("TIMETRACKER_DB_PATH")
|
||||||
|
?? Path.Combine(builder.Environment.ContentRootPath, "timetracker.db");
|
||||||
|
builder.Services.AddDbContextFactory<TimetrackerDbContext>(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<IDbContextFactory<TimetrackerDbContext>>();
|
||||||
|
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.UseRateLimiter();
|
||||||
|
app.UseAuthentication();
|
||||||
|
app.UseAuthorization();
|
||||||
|
app.UseAntiforgery();
|
||||||
|
|
||||||
|
app.MapStaticAssets();
|
||||||
|
|
||||||
|
// Map Hub
|
||||||
|
app.MapHub<NotificationHub>("/hubs/notifications");
|
||||||
|
|
||||||
|
// Map Blazor WASM
|
||||||
|
app.MapRazorComponents<App>()
|
||||||
|
.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 });
|
||||||
|
}).RequireRateLimiting("auth-limit");
|
||||||
|
|
||||||
|
app.MapPost("/api/auth/register", async (HttpContext ctx, [FromBody] RegisterRequest req, IAuthService authService) =>
|
||||||
|
{
|
||||||
|
if (!string.IsNullOrEmpty(req.Honeypot))
|
||||||
|
{
|
||||||
|
// Silently reject bots
|
||||||
|
return Results.BadRequest("Registrierung fehlgeschlagen.");
|
||||||
|
}
|
||||||
|
|
||||||
|
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 });
|
||||||
|
}).RequireRateLimiting("auth-limit");
|
||||||
|
|
||||||
|
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 (ClaimsPrincipal claimsPrincipal, [FromQuery] string monday, ITimetrackerService trackerService) =>
|
||||||
|
{
|
||||||
|
var idClaim = claimsPrincipal.FindFirst(ClaimTypes.NameIdentifier)?.Value;
|
||||||
|
if (!int.TryParse(idClaim, out var userId)) return Results.Unauthorized();
|
||||||
|
|
||||||
|
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 (ClaimsPrincipal claimsPrincipal, [FromBody] WorkDay workDay, ITimetrackerService trackerService) =>
|
||||||
|
{
|
||||||
|
var idClaim = claimsPrincipal.FindFirst(ClaimTypes.NameIdentifier)?.Value;
|
||||||
|
if (!int.TryParse(idClaim, out var userId)) return Results.Unauthorized();
|
||||||
|
|
||||||
|
workDay.UserId = userId; // Enforce owner
|
||||||
|
await trackerService.UpsertWorkDayAsync(workDay);
|
||||||
|
return Results.Ok();
|
||||||
|
});
|
||||||
|
|
||||||
|
trackerApi.MapGet("/settings", async (ClaimsPrincipal claimsPrincipal, ITimetrackerService trackerService) =>
|
||||||
|
{
|
||||||
|
var idClaim = claimsPrincipal.FindFirst(ClaimTypes.NameIdentifier)?.Value;
|
||||||
|
if (!int.TryParse(idClaim, out var userId)) return Results.Unauthorized();
|
||||||
|
|
||||||
|
var settings = await trackerService.GetSettingsAsync(userId);
|
||||||
|
return Results.Ok(settings);
|
||||||
|
});
|
||||||
|
|
||||||
|
trackerApi.MapPost("/settings", async (ClaimsPrincipal claimsPrincipal, [FromBody] AppSettings settings, ITimetrackerService trackerService) =>
|
||||||
|
{
|
||||||
|
var idClaim = claimsPrincipal.FindFirst(ClaimTypes.NameIdentifier)?.Value;
|
||||||
|
if (!int.TryParse(idClaim, out var userId)) return Results.Unauthorized();
|
||||||
|
|
||||||
|
settings.UserId = userId; // Enforce owner
|
||||||
|
await trackerService.SaveSettingsAsync(settings);
|
||||||
|
return Results.Ok();
|
||||||
|
});
|
||||||
|
|
||||||
|
trackerApi.MapGet("/vacation/{year:int}", async (ClaimsPrincipal claimsPrincipal, int year, ITimetrackerService trackerService) =>
|
||||||
|
{
|
||||||
|
var idClaim = claimsPrincipal.FindFirst(ClaimTypes.NameIdentifier)?.Value;
|
||||||
|
if (!int.TryParse(idClaim, out var userId)) return Results.Unauthorized();
|
||||||
|
|
||||||
|
var days = await trackerService.GetVacationDaysAsync(userId, year);
|
||||||
|
return Results.Ok(days);
|
||||||
|
});
|
||||||
|
|
||||||
|
trackerApi.MapPost("/vacation", async (ClaimsPrincipal claimsPrincipal, [FromBody] VacationDay vacationDay, ITimetrackerService trackerService) =>
|
||||||
|
{
|
||||||
|
var idClaim = claimsPrincipal.FindFirst(ClaimTypes.NameIdentifier)?.Value;
|
||||||
|
if (!int.TryParse(idClaim, out var userId)) return Results.Unauthorized();
|
||||||
|
|
||||||
|
vacationDay.UserId = userId; // Enforce owner
|
||||||
|
await trackerService.AddVacationDayAsync(vacationDay);
|
||||||
|
return Results.Ok();
|
||||||
|
});
|
||||||
|
|
||||||
|
trackerApi.MapDelete("/vacation/{id:int}", async (ClaimsPrincipal claimsPrincipal, int id, ITimetrackerService trackerService) =>
|
||||||
|
{
|
||||||
|
var idClaim = claimsPrincipal.FindFirst(ClaimTypes.NameIdentifier)?.Value;
|
||||||
|
if (!int.TryParse(idClaim, out var userId)) return Results.Unauthorized();
|
||||||
|
|
||||||
|
await trackerService.RemoveVacationDayAsync(userId, id);
|
||||||
|
return Results.NoContent();
|
||||||
|
});
|
||||||
|
|
||||||
|
trackerApi.MapPost("/overtime", async (ClaimsPrincipal claimsPrincipal, [FromBody] AppSettings settings, ITimetrackerService trackerService) =>
|
||||||
|
{
|
||||||
|
var idClaim = claimsPrincipal.FindFirst(ClaimTypes.NameIdentifier)?.Value;
|
||||||
|
if (!int.TryParse(idClaim, out var userId)) return Results.Unauthorized();
|
||||||
|
|
||||||
|
settings.UserId = userId; // Enforce owner
|
||||||
|
var ts = await trackerService.GetTotalOvertimeAsync(userId, settings);
|
||||||
|
return Results.Ok(ts.TotalHours);
|
||||||
|
});
|
||||||
|
|
||||||
|
trackerApi.MapGet("/month", async (ClaimsPrincipal claimsPrincipal, [FromQuery] int year, [FromQuery] int month, ITimetrackerService trackerService) =>
|
||||||
|
{
|
||||||
|
var idClaim = claimsPrincipal.FindFirst(ClaimTypes.NameIdentifier)?.Value;
|
||||||
|
if (!int.TryParse(idClaim, out var userId)) return Results.Unauthorized();
|
||||||
|
|
||||||
|
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 RegisterRequest(string Username, string Password, string? Honeypot = null);
|
||||||
|
public record RenameRequest(string Username);
|
||||||
@@ -8,9 +8,16 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="10.0.8" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="*" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="*" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.8" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.8" />
|
||||||
<PackageReference Include="MudBlazor" Version="9.4.0" />
|
<PackageReference Include="MudBlazor" Version="9.4.0" />
|
||||||
|
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.2" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\timetracker.Shared\timetracker.Shared.csproj" />
|
||||||
|
<ProjectReference Include="..\timetracker.Client\timetracker.Client.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 4.1 KiB |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user