add: admin dashboard

TaskTrackingSystem.WebApi/Program.cs

@@ -128,6 +128,188 @@ static async System.Threading.Tasks.Task EnsureSeedDataAsync(WebApplication app)
         backlogMenu.UpdatedAt = DateTime.UtcNow;
     }
 
+    var dashboardMenu = await db.Menus.FirstOrDefaultAsync(m => m.MenuCode == "DASHBOARD");
+    if (dashboardMenu == null)
+    {
+        dashboardMenu = new Menu
+        {
+            MenuCode = "DASHBOARD",
+            MenuName = "Dashboard",
+            MenuUrl = null,
+            Icon = "layout-grid",
+            Visible = true,
+            OrderNo = 0,
+            IsDeleted = false,
+            CreatedAt = DateTime.UtcNow
+        };
+        db.Menus.Add(dashboardMenu);
+        await db.SaveChangesAsync();
+    }
+    else
+    {
+        dashboardMenu.MenuName = "Dashboard";
+        dashboardMenu.MenuUrl = null;
+        dashboardMenu.Icon = "layout-grid";
+        dashboardMenu.Visible = true;
+        dashboardMenu.OrderNo = 0;
+        dashboardMenu.IsDeleted = false;
+        dashboardMenu.UpdatedAt = DateTime.UtcNow;
+    }
+
+    var adminDashboardMenu = await db.Menus.FirstOrDefaultAsync(m => m.MenuCode == "DASHBOARD_ADMIN");
+    if (adminDashboardMenu == null)
+    {
+        adminDashboardMenu = new Menu
+        {
+            MenuCode = "DASHBOARD_ADMIN",
+            ParentMenuId = dashboardMenu.MenuId,
+            MenuName = "Admin Dashboard",
+            MenuUrl = "/dashboard",
+            Icon = "layout-dashboard",
+            Visible = true,
+            OrderNo = 1,
+            IsDeleted = false,
+            CreatedAt = DateTime.UtcNow
+        };
+        db.Menus.Add(adminDashboardMenu);
+    }
+    else
+    {
+        adminDashboardMenu.ParentMenuId = dashboardMenu.MenuId;
+        adminDashboardMenu.MenuName = "Admin Dashboard";
+        adminDashboardMenu.MenuUrl = "/dashboard";
+        adminDashboardMenu.Icon = "layout-dashboard";
+        adminDashboardMenu.Visible = true;
+        adminDashboardMenu.OrderNo = 1;
+        adminDashboardMenu.IsDeleted = false;
+        adminDashboardMenu.UpdatedAt = DateTime.UtcNow;
+    }
+
+    var managerDashboardMenu = await db.Menus.FirstOrDefaultAsync(m => m.MenuCode == "DASHBOARD_MANAGER");
+    if (managerDashboardMenu == null)
+    {
+        managerDashboardMenu = new Menu
+        {
+            MenuCode = "DASHBOARD_MANAGER",
+            ParentMenuId = dashboardMenu.MenuId,
+            MenuName = "Manager Dashboard",
+            MenuUrl = "/dashboard/manager",
+            Icon = "layout-dashboard",
+            Visible = true,
+            OrderNo = 2,
+            IsDeleted = false,
+            CreatedAt = DateTime.UtcNow
+        };
+        db.Menus.Add(managerDashboardMenu);
+    }
+    else
+    {
+        managerDashboardMenu.ParentMenuId = dashboardMenu.MenuId;
+        managerDashboardMenu.MenuName = "Manager Dashboard";
+        managerDashboardMenu.MenuUrl = "/dashboard/manager";
+        managerDashboardMenu.Icon = "layout-dashboard";
+        managerDashboardMenu.Visible = true;
+        managerDashboardMenu.OrderNo = 2;
+        managerDashboardMenu.IsDeleted = false;
+        managerDashboardMenu.UpdatedAt = DateTime.UtcNow;
+    }
+
+    var employeeDashboardMenu = await db.Menus.FirstOrDefaultAsync(m => m.MenuCode == "DASHBOARD_EMPLOYEE");
+    if (employeeDashboardMenu == null)
+    {
+        employeeDashboardMenu = new Menu
+        {
+            MenuCode = "DASHBOARD_EMPLOYEE",
+            ParentMenuId = dashboardMenu.MenuId,
+            MenuName = "Employee Dashboard",
+            MenuUrl = "/dashboard/employee",
+            Icon = "layout-dashboard",
+            Visible = true,
+            OrderNo = 3,
+            IsDeleted = false,
+            CreatedAt = DateTime.UtcNow
+        };
+        db.Menus.Add(employeeDashboardMenu);
+    }
+    else
+    {
+        employeeDashboardMenu.ParentMenuId = dashboardMenu.MenuId;
+        employeeDashboardMenu.MenuName = "Employee Dashboard";
+        employeeDashboardMenu.MenuUrl = "/dashboard/employee";
+        employeeDashboardMenu.Icon = "layout-dashboard";
+        employeeDashboardMenu.Visible = true;
+        employeeDashboardMenu.OrderNo = 3;
+        employeeDashboardMenu.IsDeleted = false;
+        employeeDashboardMenu.UpdatedAt = DateTime.UtcNow;
+    }
+
+    await db.SaveChangesAsync();
+
+    var adminRole = await db.Roles.FirstOrDefaultAsync(r => r.Name == "Admin" && !r.IsDeleted);
+    if (adminRole != null)
+    {
+        var adminDashboardAccess = await db.RoleMenus.FirstOrDefaultAsync(rm => rm.RoleId == adminRole.Id && rm.MenuId == adminDashboardMenu.MenuId);
+        if (adminDashboardAccess == null)
+        {
+            db.RoleMenus.Add(new RoleMenu
+            {
+                RoleId = adminRole.Id,
+                MenuId = adminDashboardMenu.MenuId,
+                IsDeleted = false,
+                CreatedAt = DateTime.UtcNow
+            });
+        }
+        else
+        {
+            adminDashboardAccess.IsDeleted = false;
+            adminDashboardAccess.UpdatedAt = DateTime.UtcNow;
+        }
+    }
+
+    var managerRole = await db.Roles.FirstOrDefaultAsync(r => r.Name == "Manager" && !r.IsDeleted);
+    if (managerRole != null)
+    {
+        var managerDashboardAccess = await db.RoleMenus.FirstOrDefaultAsync(rm => rm.RoleId == managerRole.Id && rm.MenuId == managerDashboardMenu.MenuId);
+        if (managerDashboardAccess == null)
+        {
+            db.RoleMenus.Add(new RoleMenu
+            {
+                RoleId = managerRole.Id,
+                MenuId = managerDashboardMenu.MenuId,
+                IsDeleted = false,
+                CreatedAt = DateTime.UtcNow
+            });
+        }
+        else
+        {
+            managerDashboardAccess.IsDeleted = false;
+            managerDashboardAccess.UpdatedAt = DateTime.UtcNow;
+        }
+    }
+
+    var employeeRole = await db.Roles.FirstOrDefaultAsync(r => r.Name == "Employee" && !r.IsDeleted);
+    if (employeeRole != null)
+    {
+        var employeeDashboardAccess = await db.RoleMenus.FirstOrDefaultAsync(rm => rm.RoleId == employeeRole.Id && rm.MenuId == employeeDashboardMenu.MenuId);
+        if (employeeDashboardAccess == null)
+        {
+            db.RoleMenus.Add(new RoleMenu
+            {
+                RoleId = employeeRole.Id,
+                MenuId = employeeDashboardMenu.MenuId,
+                IsDeleted = false,
+                CreatedAt = DateTime.UtcNow
+            });
+        }
+        else
+        {
+            employeeDashboardAccess.IsDeleted = false;
+            employeeDashboardAccess.UpdatedAt = DateTime.UtcNow;
+        }
+    }
+
+    await db.SaveChangesAsync();
+
     // Soft-delete existing tasks that belong to deleted projects
     var orphanedTasks = await db.Tasks
         .Where(t => t.IsDeleted != true && t.Project.IsDeleted == true)

TaskTrackingSystem.WebApp/AccountEndpoints.cs

@@ -23,6 +23,7 @@ public static class AccountEndpoints
     private static async Task<IResult> LoginAsync(
         HttpContext context,
         IHttpClientFactory httpClientFactory,
+        MenuAuthorizationService menuAuthorization,
         [FromForm] string usernameOrEmail,
         [FromForm] string password,
         [FromForm] bool? rememberMe,
@@ -60,12 +61,14 @@ public static class AccountEndpoints
         }
 
         await SignInUserAsync(context, result.Value, rememberMe ?? false);
-        return Results.Redirect(GetSafeReturnUrl(returnUrl));
+        var landingPage = await ResolveLandingPageAsync(menuAuthorization, result.Value);
+        return Results.Redirect(GetSafeReturnUrl(returnUrl, landingPage));
     }
 
     private static async Task<IResult> RegisterAsync(
         HttpContext context,
         IHttpClientFactory httpClientFactory,
+        MenuAuthorizationService menuAuthorization,
         [FromForm] RegisterDto registerDto)
     {
         HttpResponseMessage response;
@@ -87,7 +90,8 @@ public static class AccountEndpoints
             if (result?.IsSuccess == true && result.Value != null && !string.IsNullOrWhiteSpace(result.Value.Username))
             {
                 await SignInUserAsync(context, result.Value, false);
-                return Results.Redirect("/dashboard");
+                var landingPage = await ResolveLandingPageAsync(menuAuthorization, result.Value);
+                return Results.Redirect(GetSafeReturnUrl(null, landingPage));
             }
             else if (result != null && !string.IsNullOrEmpty(result.ErrorMessage))
             {
@@ -305,13 +309,69 @@ public static class AccountEndpoints
         return Results.Redirect($"/login?error={error}{safeReturnUrl}");
     }
 
-    private static string GetSafeReturnUrl(string? returnUrl)
+    private static string GetSafeReturnUrl(string? returnUrl, string landingPage)
     {
         if (string.IsNullOrWhiteSpace(returnUrl) || !returnUrl.StartsWith('/') || returnUrl.StartsWith("//"))
         {
-            return "/dashboard";
+            return landingPage;
         }
 
         return returnUrl;
     }
+
+    private static async Task<string> ResolveLandingPageAsync(MenuAuthorizationService menuAuthorization, AuthResponseDto authResult)
+    {
+        var principal = BuildTemporaryPrincipal(authResult);
+        var menus = await menuAuthorization.GetUserMenusAsync(principal);
+        var dashboardMenu = FindFirstDashboardMenu(menus);
+        return dashboardMenu ?? "/dashboard";
+    }
+
+    private static ClaimsPrincipal BuildTemporaryPrincipal(AuthResponseDto authResult)
+    {
+        var claims = new List<Claim>
+        {
+            new(ClaimTypes.Name, authResult.Username),
+            new(ClaimTypes.Email, authResult.Email),
+            new(ClaimTypes.Role, authResult.RoleName),
+            new("role_id", authResult.RoleId.ToString()),
+            new("jwt_token", authResult.Token)
+        };
+
+        return new ClaimsPrincipal(new ClaimsIdentity(claims, CookieAuthenticationDefaults.AuthenticationScheme));
+    }
+
+    private static string? FindFirstDashboardMenu(IEnumerable<TaskTrackingSystem.Shared.Models.Menu.MenuDto> menus)
+    {
+        foreach (var menu in menus)
+        {
+            var found = FindFirstDashboardMenu(menu);
+            if (!string.IsNullOrWhiteSpace(found))
+            {
+                return found;
+            }
+        }
+
+        return null;
+    }
+
+    private static string? FindFirstDashboardMenu(TaskTrackingSystem.Shared.Models.Menu.MenuDto menu)
+    {
+        if (!string.IsNullOrWhiteSpace(menu.MenuUrl) &&
+            menu.MenuUrl.StartsWith("/dashboard", StringComparison.OrdinalIgnoreCase))
+        {
+            return menu.MenuUrl;
+        }
+
+        foreach (var subMenu in menu.SubMenus)
+        {
+            var found = FindFirstDashboardMenu(subMenu);
+            if (!string.IsNullOrWhiteSpace(found))
+            {
+                return found;
+            }
+        }
+
+        return null;
+    }
 }

TaskTrackingSystem.WebApp/Components/Layout/MainLayout.razor

@@ -89,7 +89,7 @@
                     <p class="text-center mt-2 max-w-sm text-sm" style="color: var(--text-muted);">
                         You do not have permission to access this page. Please contact your system administrator.
                     </p>
-                    <a href="/dashboard" class="mt-6 inline-flex items-center rounded-lg px-4 py-2.5 text-sm font-medium text-white transition-colors shadow-sm hover:opacity-90" style="background-color: var(--brand-primary);">
+                    <a href="@dashboardHref" class="mt-6 inline-flex items-center rounded-lg px-4 py-2.5 text-sm font-medium text-white transition-colors shadow-sm hover:opacity-90" style="background-color: var(--brand-primary);">
                         <i data-lucide="arrow-left" class="h-4 w-4 mr-2"></i>
                         Back to Dashboard
                     </a>
@@ -106,6 +106,7 @@
     [Inject] private Microsoft.AspNetCore.Components.Authorization.AuthenticationStateProvider AuthStateProvider { get; set; } = default!;
 
     private bool isAuthorizedPage = true;
+    private string dashboardHref = "/dashboard";
 
     private bool IsDashboardPage => 
         string.IsNullOrEmpty(Navigation.ToBaseRelativePath(Navigation.Uri)) || 
@@ -118,6 +119,9 @@
         "reports" => "Reports",
         "roles" => "Roles & Access",
         "users" => "Users",
+        "dashboard" => "Dashboard",
+        "dashboard/manager" => "Manager Dashboard",
+        "dashboard/employee" => "Employee Dashboard",
         _ => "Workspace"
     };
 
@@ -159,6 +163,7 @@
         }
 
         var menus = await MenuAuthorization.GetUserMenusAsync(user);
+        dashboardHref = ResolveDashboardHref(menus);
         var allowed = MenuAuthorization.IsRouteAllowed(user, relativePath);
         Console.WriteLine($"[DEBUG MainLayout] User: {user.Identity?.Name}, Path: {relativePath}, Allowed: {allowed}");
         if (menus != null)
@@ -188,4 +193,38 @@
     {
         Navigation.LocationChanged -= OnLocationChanged;
     }
+
+    private static string ResolveDashboardHref(IEnumerable<TaskTrackingSystem.Shared.Models.Menu.MenuDto> menus)
+    {
+        foreach (var menu in menus)
+        {
+            var found = ResolveDashboardHref(menu);
+            if (!string.IsNullOrWhiteSpace(found))
+            {
+                return found;
+            }
+        }
+
+        return "/dashboard";
+    }
+
+    private static string? ResolveDashboardHref(TaskTrackingSystem.Shared.Models.Menu.MenuDto menu)
+    {
+        if (!string.IsNullOrWhiteSpace(menu.MenuUrl) &&
+            menu.MenuUrl.StartsWith("/dashboard", StringComparison.OrdinalIgnoreCase))
+        {
+            return menu.MenuUrl;
+        }
+
+        foreach (var subMenu in menu.SubMenus)
+        {
+            var found = ResolveDashboardHref(subMenu);
+            if (!string.IsNullOrWhiteSpace(found))
+            {
+                return found;
+            }
+        }
+
+        return null;
+    }
 }

TaskTrackingSystem.WebApp/Components/Layout/NavMenu.razor

@@ -109,14 +109,13 @@
 
     private List<MenuDto> ProcessMenus(List<MenuDto> rawMenus)
     {
-        var result = new List<MenuDto>();
-
-        foreach (var m in rawMenus)
-        {
-            result.Add(m);
-        }
-
-        return result;
+        return rawMenus
+            .Where(menu => !string.Equals(menu.MenuCode, "ROLE_LAYOUTS", StringComparison.OrdinalIgnoreCase) &&
+                           !string.Equals(menu.MenuName, "Role Layouts", StringComparison.OrdinalIgnoreCase))
+            .OrderBy(menu => string.Equals(menu.MenuCode, "DASHBOARD", StringComparison.OrdinalIgnoreCase) ? 0 : 1)
+            .ThenBy(menu => menu.OrderNo)
+            .ThenBy(menu => menu.MenuName)
+            .ToList();
     }
 
     private async Task RefreshMenusAsync()

TaskTrackingSystem.WebApp/Components/Pages/EmployeeDashboard.razor

@@ -0,0 +1,46 @@
+@page "/dashboard/employee"
+@using Microsoft.AspNetCore.Authorization
+@rendermode @(new InteractiveServerRenderMode(prerender: false))
+@attribute [Authorize(Roles = "Employee")]
+
+<PageTitle>Employee Dashboard</PageTitle>
+
+<div class="space-y-6 text-slate-900">
+    <div class="rounded-[32px] border border-slate-200 bg-white px-8 py-8 shadow-sm shadow-slate-200/60">
+        <p class="text-sm font-semibold uppercase tracking-[0.22em] text-emerald-600">Work View</p>
+        <h2 class="mt-2 text-4xl font-bold tracking-tight text-slate-900">Welcome back, team member</h2>
+        <p class="mt-3 max-w-2xl text-sm text-slate-600">
+            This dashboard is reserved for personal tasks, due dates, and daily progress.
+        </p>
+    </div>
+
+    <div class="grid grid-cols-1 gap-4 sm:grid-cols-2 xl:grid-cols-4">
+        <div class="rounded-[24px] border border-slate-200 bg-white p-5 shadow-sm shadow-slate-200/50">
+            <p class="text-sm font-semibold text-slate-500">In Progress</p>
+            <p class="mt-4 text-4xl font-bold text-slate-900">--</p>
+            <p class="mt-2 text-sm text-slate-500">Placeholder metric</p>
+        </div>
+        <div class="rounded-[24px] border border-slate-200 bg-white p-5 shadow-sm shadow-slate-200/50">
+            <p class="text-sm font-semibold text-slate-500">To Do</p>
+            <p class="mt-4 text-4xl font-bold text-slate-900">--</p>
+            <p class="mt-2 text-sm text-slate-500">Placeholder metric</p>
+        </div>
+        <div class="rounded-[24px] border border-slate-200 bg-white p-5 shadow-sm shadow-slate-200/50">
+            <p class="text-sm font-semibold text-slate-500">Due Soon</p>
+            <p class="mt-4 text-4xl font-bold text-slate-900">--</p>
+            <p class="mt-2 text-sm text-slate-500">Placeholder metric</p>
+        </div>
+        <div class="rounded-[24px] border border-slate-200 bg-white p-5 shadow-sm shadow-slate-200/50">
+            <p class="text-sm font-semibold text-slate-500">Completed</p>
+            <p class="mt-4 text-4xl font-bold text-slate-900">--</p>
+            <p class="mt-2 text-sm text-slate-500">Placeholder metric</p>
+        </div>
+    </div>
+
+    <div class="rounded-[28px] border border-slate-200 bg-white p-6 shadow-sm shadow-slate-200/60">
+        <h3 class="text-2xl font-bold text-slate-900">Employee dashboard shell</h3>
+        <p class="mt-2 text-sm text-slate-500">
+            We’ll plug the real task list, calendar, and progress widgets into this page next.
+        </p>
+    </div>
+</div>

TaskTrackingSystem.WebApp/Components/Pages/Home.razor

@@ -3,28 +3,28 @@
 @page "/dashboard"
 @using Microsoft.AspNetCore.Authorization
 @using Microsoft.AspNetCore.Components.Authorization
+@using TaskTrackingSystem.Shared.Enums
+@using TaskTrackingSystem.Shared.Models.Project
 @using TaskTrackingSystem.Shared.Models.Task
 @using TaskTrackingSystem.Shared.Models.User
-@using TaskTrackingSystem.Shared.Models.Project
 @using TaskTrackingSystem.Shared.Models.Dashboard
-@using TaskTrackingSystem.Shared.Enums
 @rendermode @(new InteractiveServerRenderMode(prerender: false))
-@attribute [Microsoft.AspNetCore.Authorization.Authorize]
+@attribute [Microsoft.AspNetCore.Authorization.Authorize(Roles = "Admin")]
 @inject ApiClientService ApiClient
 @inject IJSRuntime JS
 @inject AuthenticationStateProvider AuthStateProvider
 @inject MenuAuthorizationService MenuAuthorization
 
-<PageTitle>Overview</PageTitle>
+<PageTitle>Dashboard</PageTitle>
 
 <div class="space-y-8 text-slate-900">
     <div class="rounded-[32px] border border-slate-200 bg-white px-8 py-8 text-slate-900 shadow-sm shadow-slate-200/60">
         <div class="flex flex-col gap-6 lg:flex-row lg:items-end lg:justify-between">
             <div>
                 <p class="text-sm font-semibold uppercase tracking-[0.22em] text-violet-600">Overview</p>
-                <h2 class="mt-2 text-4xl font-bold tracking-tight text-slate-900">Welcome back, @currentUserName</h2>
+                <h2 class="mt-2 text-4xl font-bold tracking-tight text-slate-900">Welcome back, @currentUserFullName</h2>
                 <p class="mt-3 max-w-2xl text-sm text-slate-600">
-                    Projects, tasks, and team activity at a glance.
+                    Projects, users, and team progress at a glance.
                 </p>
             </div>
             <div class="flex flex-wrap gap-3">
@@ -49,7 +49,7 @@
                 <div class="flex h-12 w-12 items-center justify-center rounded-2xl bg-violet-500 text-white">
                     <i data-lucide="users" class="h-5 w-5"></i>
                 </div>
-                <span class="text-sm font-semibold text-emerald-500">+12 this month</span>
+                <span class="text-sm font-semibold text-emerald-500">@UsersDeltaText</span>
             </div>
             <p class="mt-5 text-4xl font-bold">@summary.TotalUsers</p>
             <p class="mt-2 text-sm text-slate-500">Total users</p>
@@ -60,9 +60,9 @@
                 <div class="flex h-12 w-12 items-center justify-center rounded-2xl bg-sky-500 text-white">
                     <i data-lucide="folder-kanban" class="h-5 w-5"></i>
                 </div>
-                <span class="text-sm font-semibold text-emerald-500">+3 this month</span>
+                <span class="text-sm font-semibold text-emerald-500">@ProjectsDeltaText</span>
             </div>
-            <p class="mt-5 text-4xl font-bold">@summary.ActiveProjectsCount</p>
+            <p class="mt-5 text-4xl font-bold">@projectsList.Count</p>
             <p class="mt-2 text-sm text-slate-500">Total projects</p>
         </div>
 
@@ -71,7 +71,7 @@
                 <div class="flex h-12 w-12 items-center justify-center rounded-2xl bg-emerald-500 text-white">
                     <i data-lucide="check-square" class="h-5 w-5"></i>
                 </div>
-                <span class="text-sm font-semibold text-emerald-500">+24 this week</span>
+                <span class="text-sm font-semibold text-emerald-500">@TasksDeltaText</span>
             </div>
             <p class="mt-5 text-4xl font-bold">@ActiveTasksCount</p>
             <p class="mt-2 text-sm text-slate-500">Active tasks</p>
@@ -82,7 +82,7 @@
                 <div class="flex h-12 w-12 items-center justify-center rounded-2xl bg-amber-500 text-white">
                     <i data-lucide="trending-up" class="h-5 w-5"></i>
                 </div>
-                <span class="text-sm font-semibold text-emerald-500">+5% vs last mo</span>
+                <span class="text-sm font-semibold text-emerald-500">@CompletionDeltaText</span>
             </div>
             <p class="mt-5 text-4xl font-bold">@CompletionRate%</p>
             <p class="mt-2 text-sm text-slate-500">Completion rate</p>
@@ -94,41 +94,59 @@
             <div class="flex items-start justify-between gap-4">
                 <div>
                     <h3 class="text-2xl font-bold text-slate-900">Project Activity</h3>
-                    <p class="mt-1 text-sm text-slate-500">Created and completed tasks over the last six months.</p>
+                    <p class="mt-1 text-sm text-slate-500">Active vs completed tasks per month.</p>
                 </div>
                 <div class="text-sm text-slate-500">@ActivityRangeLabel</div>
             </div>
 
             <div class="mt-6">
-                <svg viewBox="0 0 760 340" class="h-[340px] w-full">
-                    <defs>
-                        <linearGradient id="activityFill" x1="0" x2="0" y1="0" y2="1">
-                            <stop offset="0%" stop-color="#7c3aed" stop-opacity="0.18" />
-                            <stop offset="100%" stop-color="#7c3aed" stop-opacity="0" />
-                        </linearGradient>
-                    </defs>
-
-                    @for (var i = 0; i < 5; i++)
-                    {
-                        var y = 60 + (i * 55);
-                        <line x1="48" y1="@y" x2="730" y2="@y" stroke="#e2e8f0" stroke-width="1" />
-                    }
+                <div class="relative">
+                    <svg viewBox="0 0 760 340" class="h-[340px] w-full">
+                        <defs>
+                            <linearGradient id="activityFill" x1="0" x2="0" y1="0" y2="1">
+                                <stop offset="0%" stop-color="#7c3aed" stop-opacity="0.18" />
+                                <stop offset="100%" stop-color="#7c3aed" stop-opacity="0" />
+                            </linearGradient>
+                        </defs>
+
+                        @for (var i = 0; i < 5; i++)
+                        {
+                            var y = 60 + (i * 55);
+                            <line x1="48" y1="@y" x2="730" y2="@y" stroke="#e2e8f0" stroke-width="1" />
+                        }
 
-                    @for (var i = 0; i < 6; i++)
-                    {
-                        var x = 60 + (i * 125);
-                        <line x1="@x" y1="40" x2="@x" y2="280" stroke="#e2e8f0" stroke-width="1" />
-                    }
+                        @for (var i = 0; i < 6; i++)
+                        {
+                            var x = 60 + (i * 125);
+                            <line x1="@x" y1="40" x2="@x" y2="280" stroke="#e2e8f0" stroke-width="1" />
+                        }
 
-                    <path d="@ActivityAreaPath" fill="url(#activityFill)" />
-                    <path d="@ActivityLinePath" fill="none" stroke="#7c3aed" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" />
+                        <path d="@ActivityAreaPath" fill="url(#activityFill)" />
+                        <path d="@ActivityLinePath" fill="none" stroke="#7c3aed" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" />
 
-                    @foreach (var point in ActivityPoints)
+                        @for (var i = 0; i < ActivityMonths.Count; i++)
+                        {
+                            var index = i;
+                            var point = ActivityPoints[i];
+                            <circle cx="@point.X" cy="@point.Y" r="5"
+                                    fill="#7c3aed"
+                                    stroke="#ddd6fe"
+                                    stroke-width="3"
+                                    @onmouseenter="() => SetHoveredActivity(index)"
+                                    @onmouseleave="ClearHoveredActivity" />
+                        }
+                    </svg>
+
+                    @if (hoveredActivity is not null)
                     {
-                        <circle cx="@point.X" cy="@point.Y" r="5" fill="#7c3aed" stroke="#ddd6fe" stroke-width="3" />
+                        <div class="pointer-events-none absolute z-20 rounded-2xl border border-slate-200 bg-white px-4 py-3 shadow-lg shadow-slate-200/70"
+                             style="@HoveredActivityStyle">
+                            <div class="text-sm font-semibold text-slate-900">@hoveredActivity.Value.Label</div>
+                            <div class="mt-2 text-sm text-emerald-600">Completed: @hoveredActivity.Value.Completed</div>
+                            <div class="mt-1 text-sm text-violet-600">Active: @hoveredActivity.Value.Active</div>
+                        </div>
                     }
-
-                </svg>
+                </div>
 
                 <div class="mt-4 flex items-center justify-between text-xs text-slate-500">
                     @foreach (var label in ActivityLabels)
@@ -147,8 +165,10 @@
                 <div class="relative">
                     <svg viewBox="0 0 220 220" class="h-56 w-56">
                         <circle cx="110" cy="110" r="74" fill="none" stroke="#e5e7eb" stroke-width="24" />
-                        @foreach (var slice in DonutSlices)
+                        @for (var i = 0; i < DonutSlices.Count; i++)
                         {
+                            var index = i;
+                            var slice = DonutSlices[i];
                             <circle cx="110" cy="110" r="74"
                                     fill="none"
                                     stroke="@slice.Color"
@@ -156,19 +176,35 @@
                                     stroke-linecap="round"
                                     stroke-dasharray="@slice.DashArray"
                                     stroke-dashoffset="@slice.DashOffset"
-                                    transform="rotate(-90 110 110)" />
+                                    transform="rotate(-90 110 110)"
+                                    @onmouseenter="() => SetHoveredSlice(index)"
+                                    @onmouseleave="ClearHoveredSlice" />
                         }
                     </svg>
-                    <div class="pointer-events-none absolute inset-0 flex flex-col items-center justify-center">
-                        <div class="text-3xl font-bold text-slate-900">@TotalTasksCount</div>
-                        <div class="text-xs text-slate-500">tasks</div>
-                    </div>
+
+                    @if (hoveredSlice is not null)
+                    {
+                        <div class="pointer-events-none absolute inset-0 flex items-center justify-center">
+                            <div class="rounded-2xl border border-slate-200 bg-white px-4 py-3 shadow-lg shadow-slate-200/70">
+                                <div class="text-sm font-semibold text-slate-900">@hoveredSlice.Value.Label</div>
+                                <div class="mt-1 text-sm text-slate-500">@hoveredSlice.Value.Count tasks</div>
+                            </div>
+                        </div>
+                    }
+                    else
+                    {
+                        <div class="pointer-events-none absolute inset-0 flex flex-col items-center justify-center">
+                            <div class="text-3xl font-bold text-slate-900">@TotalTasksCount</div>
+                            <div class="text-xs text-slate-500">tasks</div>
+                        </div>
+                    }
                 </div>
             </div>
 
             <div class="mt-3 space-y-3">
-                @foreach (var item in DistributionLegend)
+                @for (var i = 0; i < DistributionLegend.Count; i++)
                 {
+                    var item = DistributionLegend[i];
                     <div class="flex items-center justify-between rounded-2xl border border-slate-200 bg-slate-50 px-4 py-3">
                         <div class="flex items-center gap-3">
                             <span class="h-3 w-3 rounded-full" style="background-color: @item.Color"></span>
@@ -181,54 +217,138 @@
         </div>
     </div>
 
-    <div class="grid grid-cols-1 gap-5 xl:grid-cols-3">
-        <div class="rounded-[28px] border border-slate-200 bg-white p-6 text-slate-900 shadow-sm shadow-slate-200/60 xl:col-span-2">
-            <div class="flex items-center justify-between">
+    <div class="grid grid-cols-1 gap-5 xl:grid-cols-[minmax(0,1.25fr)_minmax(340px,0.75fr)]">
+        <div class="rounded-[28px] border border-slate-200 bg-white p-6 text-slate-900 shadow-sm shadow-slate-200/60">
+            <div class="flex items-center justify-between gap-4">
                 <div>
-                    <h3 class="text-xl font-bold text-slate-900">Recent Projects</h3>
-                    <p class="mt-1 text-sm text-slate-500">What the team is working on right now.</p>
+                    <h3 class="text-2xl font-bold text-slate-900">Project Timeline</h3>
+                    <p class="mt-1 text-sm text-slate-500">Showcasing five projects across the current timeline.</p>
                 </div>
+                <div class="text-sm text-slate-500">@TimelineRangeLabel</div>
             </div>
 
-            <div class="mt-5 space-y-3">
-                @foreach (var project in projectsList.OrderByDescending(p => p.CreatedAt).Take(4))
-                {
-                    <div class="rounded-2xl border border-slate-200 bg-slate-50 px-4 py-4">
-                        <div class="flex items-center justify-between gap-4">
-                            <div class="min-w-0">
-                                <p class="truncate text-sm font-semibold text-slate-900">@project.Name</p>
-                                <p class="mt-1 text-xs text-slate-500">@DisplayFormats.Date(project.StartDate) to @DisplayFormats.Date(project.EndDate)</p>
+            <div class="mt-5 overflow-hidden rounded-2xl border border-slate-200 bg-slate-50">
+                <div class="grid border-b border-slate-200 bg-white text-center text-xs font-semibold uppercase tracking-wider text-slate-500" style="@TimelineColumnsStyle">
+                    <div class="px-3 py-3 text-left">Project</div>
+                    @foreach (var month in TimelineMonths)
+                    {
+                        <div class="px-2 py-3">@month.ToString("MMM")</div>
+                    }
+                </div>
+
+                <div class="divide-y divide-slate-200">
+                    @foreach (var row in TimelineRows)
+                    {
+                        <div class="grid items-center gap-0 px-3 py-4" style="@TimelineColumnsStyle">
+                            <div class="pr-3">
+                                <div class="text-sm font-semibold text-slate-900">@row.Name</div>
+                                <div class="mt-1 text-xs text-slate-500">@row.DateLabel</div>
+                            </div>
+                            <div class="relative h-8" style="@TimelineRowSpanStyle">
+                                <div class="absolute inset-y-3 left-0 right-0 rounded-full bg-slate-200"></div>
+                                <div class="absolute inset-y-3 rounded-full" style="left: @row.Left%; width: @row.Width%; min-width: 28px; background-color: @row.Color;"></div>
+                                <div class="absolute inset-y-3 left-0 right-0 border-l-2 border-violet-400/60" style="left: @TodayMarkerLeft;"></div>
                             </div>
-                            <span class="text-xs font-semibold text-slate-600">@TaskCountForProject(project.Id) tasks</span>
                         </div>
-                    </div>
-                }
+                    }
+                </div>
+
+                <div class="flex flex-wrap items-center gap-4 px-4 py-4 text-xs text-slate-500">
+                    <div class="flex items-center gap-2"><span class="h-4 w-1 rounded-full bg-violet-400"></span> Today</div>
+                    <div class="flex items-center gap-2"><span class="h-4 w-4 rounded-full bg-slate-300"></span> Planned span</div>
+                    <div class="flex items-center gap-2"><span class="h-4 w-4 rounded-full bg-sky-400"></span> Project window</div>
+                </div>
             </div>
         </div>
 
         <div class="rounded-[28px] border border-slate-200 bg-white p-6 text-slate-900 shadow-sm shadow-slate-200/60">
-            <h3 class="text-xl font-bold text-slate-900">Team Snapshot</h3>
-            <p class="mt-1 text-sm text-slate-500">People with the most assigned work.</p>
+            <div class="flex items-start justify-between gap-4">
+                <div>
+                    <h3 class="text-2xl font-bold text-slate-900">Calendar</h3>
+                    <p class="mt-1 text-sm text-slate-500">Today and upcoming project starts.</p>
+                </div>
+                <div class="text-right">
+                    <div class="text-sm font-semibold text-violet-600">@CalendarMonthLabel</div>
+                    <div class="text-xs text-slate-500">@DateTime.Now.ToString("h:mm tt")</div>
+                </div>
+            </div>
+
+            <div class="mt-5 grid grid-cols-7 gap-2 text-center text-xs font-semibold uppercase tracking-wider text-slate-400">
+                @foreach (var day in WeekdayLabels)
+                {
+                    <span>@day</span>
+                }
+            </div>
 
-            <div class="mt-5 space-y-4">
-                @foreach (var person in TeamSnapshot)
+            <div class="mt-3 grid grid-cols-7 gap-2">
+                @foreach (var cell in CalendarCells)
                 {
-                    <div>
-                        <div class="flex items-center justify-between text-sm">
-                            <span class="font-semibold text-slate-900">@person.Name</span>
-                            <span class="text-slate-500">@person.Count tasks</span>
+                    <div class="@GetCalendarCellClasses(cell)">
+                        <div class="flex h-full flex-col justify-between">
+                            <div class="text-sm font-semibold @(cell.IsCurrentMonth ? "text-slate-900" : "text-slate-400")">@cell.Date.Day</div>
+                            <div class="flex items-center gap-1">
+                                @foreach (var dot in cell.ProjectDots)
+                                {
+                                    <span class="h-1.5 w-1.5 rounded-full" style="background-color: @dot;"></span>
+                                }
+                            </div>
                         </div>
-                        <div class="mt-2 h-2 overflow-hidden rounded-full bg-slate-200">
-                            <div class="h-full rounded-full bg-emerald-500" style="width: @person.BarWidth%"></div>
+                    </div>
+                }
+            </div>
+
+            <div class="mt-6 space-y-3">
+                <div class="text-xs font-semibold uppercase tracking-wider text-slate-400">Events</div>
+                @foreach (var item in UpcomingProjectStarts)
+                {
+                    <div class="flex items-start gap-3 rounded-2xl border border-slate-200 bg-slate-50 px-4 py-3">
+                        <span class="mt-1 h-8 w-1.5 rounded-full" style="background-color: @item.Color"></span>
+                        <div class="min-w-0">
+                            <div class="truncate text-sm font-semibold text-slate-900">@item.Name</div>
+                            <div class="text-xs text-slate-500">@item.DateLabel</div>
                         </div>
                     </div>
                 }
             </div>
+        </div>
+    </div>
 
-            <a href="/users" class="mt-5 inline-flex w-full items-center justify-center rounded-2xl border border-slate-200 bg-white px-4 py-3 text-sm font-semibold text-slate-700 shadow-sm transition-colors hover:bg-slate-50">
-                View team
+    <div class="rounded-[28px] border border-slate-200 bg-white p-6 text-slate-900 shadow-sm shadow-slate-200/60">
+        <div class="flex items-center justify-between gap-4">
+            <div>
+                <h3 class="text-2xl font-bold text-slate-900">All Projects</h3>
+                <p class="mt-1 text-sm text-slate-500">A quick snapshot of the current project list.</p>
+            </div>
+            <a href="/projects/all" class="inline-flex items-center rounded-2xl border border-slate-200 bg-white px-4 py-2.5 text-sm font-semibold text-violet-700 shadow-sm transition-colors hover:bg-violet-50">
+                View all
             </a>
         </div>
+
+        <div class="mt-5 space-y-3">
+            @foreach (var project in FeaturedProjects)
+            {
+                var progress = GetProjectProgress(project.Id);
+                <div class="rounded-2xl border border-slate-200 bg-slate-50 px-4 py-4">
+                    <div class="flex items-start justify-between gap-4">
+                        <div class="min-w-0">
+                            <div class="flex flex-wrap items-center gap-2">
+                                <p class="truncate text-sm font-semibold text-slate-900">@project.Name</p>
+                                <span class="@GetProjectBadgeClasses(project)" >@GetProjectBadgeLabel(project)</span>
+                            </div>
+                            <p class="mt-1 text-xs text-slate-500">@DisplayFormats.Date(project.StartDate) to @DisplayFormats.Date(project.EndDate)</p>
+                        </div>
+                        <div class="text-right">
+                            <div class="text-sm font-semibold text-slate-900">@progress.CompletedTasksCount/@progress.TotalTasksCount tasks</div>
+                            <div class="text-xs text-slate-500">@progress.CompletionPercentage%</div>
+                        </div>
+                    </div>
+
+                    <div class="mt-3 h-2 overflow-hidden rounded-full bg-slate-200">
+                        <div class="h-full rounded-full bg-violet-600" style="width: @progress.CompletionPercentage%"></div>
+                    </div>
+                </div>
+            }
+        </div>
     </div>
 </div>
 
@@ -240,26 +360,40 @@
     private List<UserDto> usersList = new();
     private List<ProjectDto> projectsList = new();
     private string currentUserName = "User";
+    private string currentUserFullName = "User";
     private bool canCreateTask = false;
 
-    private List<string> ActivityLabels => ActivityMonths.Select(m => m.Label).ToList();
+    private int? hoveredActivityIndex;
+    private int? hoveredSliceIndex;
 
-    private IReadOnlyList<ActivityMonth> ActivityMonths =>
-        GetActivityMonths();
+    private readonly string[] WeekdayLabels = ["M", "T", "W", "T", "F", "S", "S"];
 
-    private string ActivityRangeLabel =>
-        $"{ActivityMonths.First().Label} - {ActivityMonths.Last().Label}";
-
-    private string ActivityLinePath => BuildActivityPath(ActivityMonths, false);
-    private string ActivityAreaPath => BuildActivityPath(ActivityMonths, true);
-    private IReadOnlyList<ActivityPoint> ActivityPoints => BuildActivityPoints();
-    private IReadOnlyList<DistributionSlice> DonutSlices => BuildDonutSlices();
-    private IReadOnlyList<DistributionItem> DistributionLegend => BuildDistributionLegend();
+    private List<ActivityMonthStat> ActivityMonths => BuildActivityMonths();
+    private List<string> ActivityLabels => ActivityMonths.Select(month => month.Label).ToList();
+    private string ActivityRangeLabel => $"{ActivityMonths.First().Label} - {ActivityMonths.Last().Label}";
+    private string ActivityLinePath => BuildActivityPath(ActivityMonths);
+    private string ActivityAreaPath => BuildActivityAreaPath(ActivityMonths);
+    private List<ActivityPoint> ActivityPoints => BuildActivityPoints();
+    private List<DistributionSlice> DonutSlices => BuildDonutSlices();
+    private List<DistributionLegendItem> DistributionLegend => BuildDistributionLegend();
     private int TotalTasksCount => taskList.Count;
     private int ActiveTasksCount => taskList.Count(t => t.StatusId != AppTaskStatus.Done);
     private int CompletedTasksCount => taskList.Count(t => t.StatusId == AppTaskStatus.Done);
     private int CompletionRate => TotalTasksCount > 0 ? (int)Math.Round((double)CompletedTasksCount / TotalTasksCount * 100) : 0;
-    private IEnumerable<(string Name, int Count, int BarWidth)> TeamSnapshot => BuildTeamSnapshot();
+    private string UsersDeltaText => BuildDeltaText(GetUsersThisMonth() - GetUsersPreviousMonth());
+    private string ProjectsDeltaText => BuildDeltaText(GetProjectsThisMonth() - GetProjectsPreviousMonth());
+    private string TasksDeltaText => BuildDeltaText(GetActiveTasksThisMonth() - GetActiveTasksPreviousMonth());
+    private string CompletionDeltaText => BuildCompletionDeltaText();
+    private string CalendarMonthLabel => DateTime.Today.ToString("MMMM yyyy");
+    private List<CalendarCell> CalendarCells => BuildCalendarCells();
+    private List<CalendarEventItem> UpcomingProjectStarts => BuildUpcomingProjectStarts();
+    private List<ProjectDto> FeaturedProjects => projectsList.OrderBy(p => p.StartDate).ThenByDescending(p => p.CreatedAt).Take(5).ToList();
+    private List<TimelineRow> TimelineRows => BuildTimelineRows();
+    private List<DateTime> TimelineMonths => BuildTimelineMonths();
+    private string TimelineRangeLabel => TimelineMonths.Count > 0 ? $"{TimelineMonths.First():MMM yyyy} - {TimelineMonths.Last():MMM yyyy}" : string.Empty;
+    private string TimelineColumnsStyle => $"grid-template-columns: 180px repeat({TimelineMonths.Count}, minmax(44px, 1fr));";
+    private string TimelineRowSpanStyle => $"grid-column: 2 / span {TimelineMonths.Count};";
+    private string TodayMarkerLeft => GetTimelineTodayMarkerLeft();
 
     protected override async Task OnInitializedAsync()
     {
@@ -276,6 +410,7 @@
             var authState = await AuthStateProvider.GetAuthenticationStateAsync();
             var user = authState.User;
             currentUserName = user.Identity?.Name ?? "User";
+
             var summaryResult = await client.GetFromJsonAsync<Result<DashboardSummaryDto>>("Dashboard/summary", Serialization.CaseInsensitive);
             if (summaryResult?.IsSuccess == true && summaryResult.Value != null)
             {
@@ -297,6 +432,8 @@
             taskList = await client.GetFromJsonAsync<List<TaskDto>>("Task", Serialization.CaseInsensitive) ?? new();
             usersList = await client.GetFromJsonAsync<List<UserDto>>("User", Serialization.CaseInsensitive) ?? new();
             projectsList = await client.GetFromJsonAsync<List<ProjectDto>>("Project", Serialization.CaseInsensitive) ?? new();
+
+            currentUserFullName = ResolveCurrentUserFullName();
         }
         catch (Exception ex)
         {
@@ -309,27 +446,44 @@
         await JS.InvokeVoidAsync("initIcons");
     }
 
-    private static string GetMonthLabel(DateTime date) => date.ToString("MMM");
+    private string ResolveCurrentUserFullName()
+    {
+        var user = usersList.FirstOrDefault(u => string.Equals(u.Username, currentUserName, StringComparison.OrdinalIgnoreCase));
+        if (user != null)
+        {
+            return $"{user.FirstName} {user.LastName}".Trim();
+        }
+
+        return currentUserName;
+    }
 
-    private IReadOnlyList<ActivityMonth> GetActivityMonths()
+    private List<ActivityMonthStat> BuildActivityMonths()
     {
-        var months = new List<ActivityMonth>();
         var now = DateTime.Today;
         var start = new DateTime(now.Year, now.Month, 1).AddMonths(-5);
+        var months = new List<ActivityMonthStat>();
 
         for (var i = 0; i < 6; i++)
         {
             var monthStart = start.AddMonths(i);
             var nextMonth = monthStart.AddMonths(1);
-            var created = taskList.Count(task => task.CreatedAt >= monthStart && task.CreatedAt < nextMonth);
-            var completed = taskList.Count(task => task.CompletedAt.HasValue && task.CompletedAt.Value >= monthStart && task.CompletedAt.Value < nextMonth);
-            months.Add(new ActivityMonth(GetMonthLabel(monthStart), created, completed));
+            var active = taskList.Count(task =>
+                task.CreatedAt >= monthStart &&
+                task.CreatedAt < nextMonth &&
+                task.StatusId != AppTaskStatus.Done);
+
+            var completed = taskList.Count(task =>
+                task.CompletedAt.HasValue &&
+                task.CompletedAt.Value >= monthStart &&
+                task.CompletedAt.Value < nextMonth);
+
+            months.Add(new ActivityMonthStat(GetMonthLabel(monthStart), active, completed));
         }
 
         return months;
     }
 
-    private string BuildActivityPath(IReadOnlyList<ActivityMonth> months, bool filled)
+    private string BuildActivityPath(IReadOnlyList<ActivityMonthStat> months)
     {
         if (months.Count == 0)
         {
@@ -345,35 +499,56 @@
         double X(int i) => left + (i * ((right - left) / (months.Count - 1)));
         double Y(double value) => bottom - Math.Min(value, maxValue) / maxValue * (bottom - top);
 
-        var values = months.Select(m => (double)m.Created).ToList();
         var points = new List<string>();
-
         for (var i = 0; i < months.Count; i++)
         {
-            points.Add($"{X(i):0},{Y(values[i]):0}");
+            points.Add($"{X(i):0},{Y(months[i].Active):0}");
         }
 
-        var linePath = $"M {points[0]}";
-        if (points.Count > 1)
+        var path = $"M {points[0]}";
+        for (var i = 1; i < points.Count; i++)
         {
-            for (var i = 1; i < points.Count; i++)
-            {
-                linePath += $" L {points[i]}";
-            }
+            path += $" L {points[i]}";
+        }
+
+        return path;
+    }
+
+    private string BuildActivityAreaPath(IReadOnlyList<ActivityMonthStat> months)
+    {
+        if (months.Count == 0)
+        {
+            return string.Empty;
         }
 
-        if (!filled)
+        const double left = 48;
+        const double right = 730;
+        const double top = 48;
+        const double bottom = 280;
+        const double maxValue = 20;
+
+        double X(int i) => left + (i * ((right - left) / (months.Count - 1)));
+        double Y(double value) => bottom - Math.Min(value, maxValue) / maxValue * (bottom - top);
+
+        var points = new List<string>();
+        for (var i = 0; i < months.Count; i++)
         {
-            return linePath;
+            points.Add($"{X(i):0},{Y(months[i].Active):0}");
         }
 
-        return $"{linePath} L {X(months.Count - 1):0},{bottom:0} L {X(0):0},{bottom:0} Z";
+        var path = $"M {points[0]}";
+        for (var i = 1; i < points.Count; i++)
+        {
+            path += $" L {points[i]}";
+        }
+
+        return $"{path} L {X(months.Count - 1):0},{bottom:0} L {X(0):0},{bottom:0} Z";
     }
 
-    private IReadOnlyList<ActivityPoint> BuildActivityPoints()
+    private List<ActivityPoint> BuildActivityPoints()
     {
-        var points = new List<ActivityPoint>();
         var months = ActivityMonths;
+        var points = new List<ActivityPoint>();
         if (months.Count == 0)
         {
             return points;
@@ -383,28 +558,21 @@
         const double right = 730;
         const double top = 48;
         const double bottom = 280;
-        var maxValue = Math.Max(months.Max(m => m.Created), 1);
+        var maxValue = Math.Max(months.Max(m => m.Active), 1);
+
         double X(int i) => left + (i * ((right - left) / (months.Count - 1)));
         double Y(double value) => bottom - Math.Min(value, maxValue) / (double)maxValue * (bottom - top);
 
         for (var i = 0; i < months.Count; i++)
         {
-            points.Add(new ActivityPoint(X(i), Y(months[i].Created)));
+            points.Add(new ActivityPoint(months[i].Label, X(i), Y(months[i].Active), months[i].Active, months[i].Completed));
         }
 
         return points;
     }
 
-    private IReadOnlyList<DistributionSlice> BuildDonutSlices()
+    private List<DistributionSlice> BuildDonutSlices()
     {
-        var colors = new[]
-        {
-            "#10b981",
-            "#8b5cf6",
-            "#06b6d4",
-            "#ef4444"
-        };
-
         var counts = new[]
         {
             CompletedTasksCount,
@@ -413,6 +581,8 @@
             Math.Max(taskList.Count(t => t.DueDate.Date < DateTime.Today && t.StatusId != AppTaskStatus.Done), 0)
         };
 
+        var colors = new[] { "#10b981", "#8b5cf6", "#06b6d4", "#ef4444" };
+
         var total = counts.Sum();
         if (total <= 0)
         {
@@ -422,53 +592,322 @@
         var circumference = 2 * Math.PI * 74;
         var slices = new List<DistributionSlice>();
         var offset = 0.0;
+
         for (var i = 0; i < counts.Length; i++)
         {
-            var value = counts[i];
-            var fraction = value / (double)total;
+            var fraction = counts[i] / (double)total;
             var dash = $"{circumference * fraction:0.##} {circumference:0.##}";
             var dashOffset = circumference - (circumference * offset);
-            slices.Add(new DistributionSlice(colors[i], dash, dashOffset));
+            slices.Add(new DistributionSlice(GetDistributionLabel(i), counts[i], colors[i], dash, dashOffset));
             offset += fraction;
         }
+
         return slices;
     }
 
-    private IReadOnlyList<DistributionItem> BuildDistributionLegend()
+    private static string GetDistributionLabel(int index) => index switch
     {
-        return new List<DistributionItem>
+        0 => "Completed",
+        1 => "In Progress",
+        2 => "To Do",
+        _ => "Overdue"
+    };
+
+    private List<DistributionLegendItem> BuildDistributionLegend()
+    {
+        return DonutSlices.Select(slice => new DistributionLegendItem(slice.Label, slice.Count, slice.Color)).ToList();
+    }
+
+    private List<CalendarCell> BuildCalendarCells()
+    {
+        var today = DateTime.Today;
+        var firstOfMonth = new DateTime(today.Year, today.Month, 1);
+        var start = firstOfMonth.AddDays(-(int)((((int)firstOfMonth.DayOfWeek + 6) % 7)));
+        var projectStarts = projectsList
+            .Select(project => new { project.StartDate, Color = GetProjectColor(project.Id) })
+            .Where(item => item.StartDate.Date >= start.Date && item.StartDate.Date < start.AddDays(42))
+            .ToList();
+
+        var cells = new List<CalendarCell>();
+        for (var i = 0; i < 42; i++)
         {
-            new("Completed", CompletedTasksCount, "#10b981"),
-            new("In Progress", taskStatuses.FirstOrDefault(s => s.StatusId == AppTaskStatus.InProgress)?.TaskCount ?? 0, "#8b5cf6"),
-            new("To Do", taskStatuses.FirstOrDefault(s => s.StatusId == AppTaskStatus.Todo)?.TaskCount ?? 0, "#06b6d4"),
-            new("Overdue", taskList.Count(t => t.DueDate.Date < DateTime.Today && t.StatusId != AppTaskStatus.Done), "#ef4444")
-        };
+            var date = start.AddDays(i);
+            var markers = projectStarts
+                .Where(item => item.StartDate.Date == date.Date)
+                .Select(item => item.Color)
+                .ToList();
+
+            cells.Add(new CalendarCell(date, date.Month == today.Month, date.Date == today.Date, markers));
+        }
+
+        return cells;
     }
 
-    private IEnumerable<(string Name, int Count, int BarWidth)> BuildTeamSnapshot()
+    private List<CalendarEventItem> BuildUpcomingProjectStarts()
     {
-        var relevantUsers = usersList
-            .Where(u => !u.Username.Equals(currentUserName, StringComparison.OrdinalIgnoreCase))
-            .Take(5)
+        return projectsList
+            .Where(project => project.StartDate.Date >= DateTime.Today)
+            .OrderBy(project => project.StartDate)
+            .Take(4)
+            .Select(project => new CalendarEventItem(project.Name, project.StartDate.ToString("MMM d"), GetProjectColor(project.Id)))
             .ToList();
+    }
+
+    private List<DateTime> BuildTimelineMonths()
+    {
+        var featured = FeaturedProjects;
+        if (featured.Count == 0)
+        {
+            return new List<DateTime>();
+        }
+
+        var start = new DateTime(featured.Min(p => p.StartDate).Year, featured.Min(p => p.StartDate).Month, 1);
+        var end = new DateTime(featured.Max(p => p.EndDate).Year, featured.Max(p => p.EndDate).Month, 1);
+
+        var months = new List<DateTime>();
+        var current = start;
+        while (current <= end)
+        {
+            months.Add(current);
+            current = current.AddMonths(1);
+        }
+
+        return months;
+    }
+
+    private List<TimelineRow> BuildTimelineRows()
+    {
+        var months = TimelineMonths;
+        if (months.Count == 0)
+        {
+            return new List<TimelineRow>();
+        }
+
+        var first = months.First();
+        var monthSpan = Math.Max(months.Count - 1, 1);
+
+        return FeaturedProjects.Select(project =>
+        {
+            var startIndex = ((project.StartDate.Year - first.Year) * 12) + project.StartDate.Month - first.Month;
+            var endIndex = ((project.EndDate.Year - first.Year) * 12) + project.EndDate.Month - first.Month;
+            startIndex = Math.Clamp(startIndex, 0, monthSpan);
+            endIndex = Math.Clamp(endIndex, startIndex, monthSpan);
+
+            var left = (startIndex / (double)monthSpan) * 100;
+            var width = Math.Max(6, ((endIndex - startIndex + 1) / (double)(monthSpan + 1)) * 100);
+            var progress = GetProjectProgress(project.Id);
+
+            return new TimelineRow(
+                project.Name,
+                $"{DisplayFormats.Date(project.StartDate)} to {DisplayFormats.Date(project.EndDate)}",
+                GetProjectColor(project.Id),
+                left,
+                width,
+                progress.CompletionPercentage);
+        }).ToList();
+    }
+
+    private string GetTimelineTodayMarkerLeft()
+    {
+        var months = TimelineMonths;
+        if (months.Count == 0)
+        {
+            return "0%";
+        }
+
+        var first = months.First();
+        var monthSpan = Math.Max(months.Count - 1, 1);
+        var currentIndex = ((DateTime.Today.Year - first.Year) * 12) + DateTime.Today.Month - first.Month;
+        currentIndex = Math.Clamp(currentIndex, 0, monthSpan);
+        return $"{(currentIndex / (double)monthSpan) * 100:0.##}%";
+    }
 
-        var maxTasks = Math.Max(taskList.Count, 1);
-        return relevantUsers
-            .Select(user =>
+    private ProjectProgressDto GetProjectProgress(long projectId)
+    {
+        return projectProgress.FirstOrDefault(item => item.ProjectId == projectId)
+            ?? new ProjectProgressDto
             {
-                var count = taskList.Count(task => task.AssignedTo == user.Id);
-                var barWidth = Math.Max(10, (int)Math.Round((double)count / maxTasks * 100));
-                return (Name: $"{user.FirstName} {user.LastName}", Count: count, BarWidth: barWidth);
-            })
-            .OrderByDescending(item => item.Count)
-            .ToList();
+                ProjectId = projectId,
+                ProjectName = string.Empty,
+                TotalTasksCount = taskList.Count(task => task.ProjectId == projectId),
+                CompletedTasksCount = taskList.Count(task => task.ProjectId == projectId && task.StatusId == AppTaskStatus.Done),
+                CompletionPercentage = 0
+            };
+    }
+
+    private string GetProjectBadgeLabel(ProjectDto project)
+    {
+        return project.StartDate.Date > DateTime.Today ? "Upcoming" : "Active";
+    }
+
+    private string GetProjectBadgeClasses(ProjectDto project)
+    {
+        return project.StartDate.Date > DateTime.Today
+            ? "rounded-full border border-amber-200 bg-amber-50 px-3 py-1 text-xs font-semibold text-amber-700"
+            : "rounded-full border border-violet-200 bg-violet-50 px-3 py-1 text-xs font-semibold text-violet-700";
+    }
+
+    private string GetProjectColor(long projectId)
+    {
+        var palette = new[]
+        {
+            "#7c3aed",
+            "#0ea5e9",
+            "#10b981",
+            "#f59e0b",
+            "#f97316"
+        };
+
+        var index = (int)(projectId % palette.Length);
+        return palette[index];
+    }
+
+    private string GetCalendarCellClasses(CalendarCell cell)
+    {
+        var classes = new List<string>
+        {
+            "min-h-[62px] rounded-2xl border p-2"
+        };
+
+        if (cell.IsToday)
+        {
+            classes.Add("border-violet-200 bg-violet-50");
+        }
+        else if (cell.IsCurrentMonth)
+        {
+            classes.Add("border-slate-200 bg-white");
+        }
+        else
+        {
+            classes.Add("border-slate-100 bg-slate-50/70");
+        }
+
+        return string.Join(' ', classes);
+    }
+
+    private void SetHoveredActivity(int index)
+    {
+        hoveredActivityIndex = index;
+    }
+
+    private void ClearHoveredActivity()
+    {
+        hoveredActivityIndex = null;
+    }
+
+    private void SetHoveredSlice(int index)
+    {
+        hoveredSliceIndex = index;
+    }
+
+    private void ClearHoveredSlice()
+    {
+        hoveredSliceIndex = null;
+    }
+
+    private ActivityMonthStat? hoveredActivity =>
+        hoveredActivityIndex.HasValue && hoveredActivityIndex.Value < ActivityMonths.Count
+            ? ActivityMonths[hoveredActivityIndex.Value]
+            : null;
+
+    private DistributionSlice? hoveredSlice =>
+        hoveredSliceIndex.HasValue && hoveredSliceIndex.Value < DonutSlices.Count
+            ? DonutSlices[hoveredSliceIndex.Value]
+            : null;
+
+    private string HoveredActivityStyle
+    {
+        get
+        {
+            if (!hoveredActivityIndex.HasValue || hoveredActivityIndex.Value >= ActivityPoints.Count)
+            {
+                return string.Empty;
+            }
+
+            var point = ActivityPoints[hoveredActivityIndex.Value];
+            return $"left: {point.X / 760d * 100:0.##}%; top: {point.Y / 340d * 100:0.##}%; transform: translate(-50%, -110%);";
+        }
+    }
+
+    private string BuildDeltaText(int delta)
+    {
+        if (delta > 0)
+        {
+            return $"+{delta} this month";
+        }
+
+        if (delta < 0)
+        {
+            return $"{delta} this month";
+        }
+
+        return "0 this month";
+    }
+
+    private string BuildCompletionDeltaText()
+    {
+        var current = GetCompletionRateForMonth(DateTime.Today);
+        var previous = GetCompletionRateForMonth(DateTime.Today.AddMonths(-1));
+        var delta = current - previous;
+
+        if (delta > 0)
+        {
+            return $"+{delta}% vs last mo";
+        }
+
+        if (delta < 0)
+        {
+            return $"{delta}% vs last mo";
+        }
+
+        return "0% vs last mo";
+    }
+
+    private int GetUsersThisMonth() =>
+        usersList.Count(user => user.CreatedAt.Year == DateTime.Today.Year && user.CreatedAt.Month == DateTime.Today.Month);
+
+    private int GetUsersPreviousMonth()
+    {
+        var previous = DateTime.Today.AddMonths(-1);
+        return usersList.Count(user => user.CreatedAt.Year == previous.Year && user.CreatedAt.Month == previous.Month);
+    }
+
+    private int GetProjectsThisMonth() =>
+        projectsList.Count(project => project.CreatedAt.Year == DateTime.Today.Year && project.CreatedAt.Month == DateTime.Today.Month);
+
+    private int GetProjectsPreviousMonth()
+    {
+        var previous = DateTime.Today.AddMonths(-1);
+        return projectsList.Count(project => project.CreatedAt.Year == previous.Year && project.CreatedAt.Month == previous.Month);
+    }
+
+    private int GetActiveTasksThisMonth() =>
+        taskList.Count(task => task.CreatedAt.Year == DateTime.Today.Year && task.CreatedAt.Month == DateTime.Today.Month && task.StatusId != AppTaskStatus.Done);
+
+    private int GetActiveTasksPreviousMonth()
+    {
+        var previous = DateTime.Today.AddMonths(-1);
+        return taskList.Count(task => task.CreatedAt.Year == previous.Year && task.CreatedAt.Month == previous.Month && task.StatusId != AppTaskStatus.Done);
+    }
+
+    private int GetCompletionRateForMonth(DateTime date)
+    {
+        var monthTasks = taskList.Where(task => task.CreatedAt.Year == date.Year && task.CreatedAt.Month == date.Month).ToList();
+        if (monthTasks.Count == 0)
+        {
+            return 0;
+        }
+
+        return (int)Math.Round(monthTasks.Count(task => task.StatusId == AppTaskStatus.Done) / (double)monthTasks.Count * 100);
     }
 
-    private int TaskCountForProject(long projectId) =>
-        taskList.Count(task => task.ProjectId == projectId);
+    private string GetMonthLabel(DateTime date) => date.ToString("MMM");
 
-    private readonly record struct ActivityMonth(string Label, int Created, int Completed);
-    private readonly record struct ActivityPoint(double X, double Y);
-    private readonly record struct DistributionSlice(string Color, string DashArray, double DashOffset);
-    private readonly record struct DistributionItem(string Label, int Count, string Color);
+    private readonly record struct ActivityMonthStat(string Label, int Active, int Completed);
+    private readonly record struct ActivityPoint(string Label, double X, double Y, int Active, int Completed);
+    private readonly record struct DistributionSlice(string Label, int Count, string Color, string DashArray, double DashOffset);
+    private readonly record struct DistributionLegendItem(string Label, int Count, string Color);
+    private readonly record struct CalendarCell(DateTime Date, bool IsCurrentMonth, bool IsToday, List<string> ProjectDots);
+    private readonly record struct CalendarEventItem(string Name, string DateLabel, string Color);
+    private readonly record struct TimelineRow(string Name, string DateLabel, string Color, double Left, double Width, double CompletionPercentage);
 }

TaskTrackingSystem.WebApp/Components/Pages/Login.razor

@@ -4,6 +4,7 @@
 @attribute [Microsoft.AspNetCore.Authorization.AllowAnonymous]
 @inject NavigationManager Navigation
 @inject AuthenticationStateProvider AuthStateProvider
+@inject MenuAuthorizationService MenuAuthorization
 @inject IJSRuntime JS
 
 <PageTitle>Sign In — TaskFlow</PageTitle>
@@ -114,7 +115,7 @@
             var authState = await AuthStateProvider.GetAuthenticationStateAsync();
             if (authState.User.Identity?.IsAuthenticated == true)
             {
-                Navigation.NavigateTo("/dashboard", forceLoad: true);
+                Navigation.NavigateTo(await ResolveLandingPageAsync(authState.User), forceLoad: true);
             }
         }
     }
@@ -126,4 +127,56 @@
         showPassword = !showPassword;
         await JS.InvokeVoidAsync("initIcons");
     }
+
+    private async Task<string> ResolveLandingPageAsync(System.Security.Claims.ClaimsPrincipal user)
+    {
+        try
+        {
+            var menus = await MenuAuthorization.GetUserMenusAsync(user);
+            var landing = FindFirstDashboardMenu(menus);
+            if (!string.IsNullOrWhiteSpace(landing))
+            {
+                return landing;
+            }
+        }
+        catch
+        {
+        }
+
+        return "/dashboard";
+    }
+
+    private static string? FindFirstDashboardMenu(IEnumerable<TaskTrackingSystem.Shared.Models.Menu.MenuDto> menus)
+    {
+        foreach (var menu in menus)
+        {
+            var found = FindFirstDashboardMenu(menu);
+            if (!string.IsNullOrWhiteSpace(found))
+            {
+                return found;
+            }
+        }
+
+        return null;
+    }
+
+    private static string? FindFirstDashboardMenu(TaskTrackingSystem.Shared.Models.Menu.MenuDto menu)
+    {
+        if (!string.IsNullOrWhiteSpace(menu.MenuUrl) &&
+            menu.MenuUrl.StartsWith("/dashboard", StringComparison.OrdinalIgnoreCase))
+        {
+            return menu.MenuUrl;
+        }
+
+        foreach (var subMenu in menu.SubMenus)
+        {
+            var found = FindFirstDashboardMenu(subMenu);
+            if (!string.IsNullOrWhiteSpace(found))
+            {
+                return found;
+            }
+        }
+
+        return null;
+    }
 }

TaskTrackingSystem.WebApp/Components/Pages/ManagerDashboard.razor

@@ -0,0 +1,46 @@
+@page "/dashboard/manager"
+@using Microsoft.AspNetCore.Authorization
+@rendermode @(new InteractiveServerRenderMode(prerender: false))
+@attribute [Authorize(Roles = "Manager")]
+
+<PageTitle>Manager Dashboard</PageTitle>
+
+<div class="space-y-6 text-slate-900">
+    <div class="rounded-[32px] border border-slate-200 bg-white px-8 py-8 shadow-sm shadow-slate-200/60">
+        <p class="text-sm font-semibold uppercase tracking-[0.22em] text-sky-600">Team View</p>
+        <h2 class="mt-2 text-4xl font-bold tracking-tight text-slate-900">Welcome back, manager</h2>
+        <p class="mt-3 max-w-2xl text-sm text-slate-600">
+            This dashboard is reserved for project tracking, team health, and workload planning.
+        </p>
+    </div>
+
+    <div class="grid grid-cols-1 gap-4 sm:grid-cols-2 xl:grid-cols-4">
+        <div class="rounded-[24px] border border-slate-200 bg-white p-5 shadow-sm shadow-slate-200/50">
+            <p class="text-sm font-semibold text-slate-500">Projects</p>
+            <p class="mt-4 text-4xl font-bold text-slate-900">--</p>
+            <p class="mt-2 text-sm text-slate-500">Placeholder metric</p>
+        </div>
+        <div class="rounded-[24px] border border-slate-200 bg-white p-5 shadow-sm shadow-slate-200/50">
+            <p class="text-sm font-semibold text-slate-500">Team Members</p>
+            <p class="mt-4 text-4xl font-bold text-slate-900">--</p>
+            <p class="mt-2 text-sm text-slate-500">Placeholder metric</p>
+        </div>
+        <div class="rounded-[24px] border border-slate-200 bg-white p-5 shadow-sm shadow-slate-200/50">
+            <p class="text-sm font-semibold text-slate-500">Pending Tasks</p>
+            <p class="mt-4 text-4xl font-bold text-slate-900">--</p>
+            <p class="mt-2 text-sm text-slate-500">Placeholder metric</p>
+        </div>
+        <div class="rounded-[24px] border border-slate-200 bg-white p-5 shadow-sm shadow-slate-200/50">
+            <p class="text-sm font-semibold text-slate-500">Risk Items</p>
+            <p class="mt-4 text-4xl font-bold text-slate-900">--</p>
+            <p class="mt-2 text-sm text-slate-500">Placeholder metric</p>
+        </div>
+    </div>
+
+    <div class="rounded-[28px] border border-slate-200 bg-white p-6 shadow-sm shadow-slate-200/60">
+        <h3 class="text-2xl font-bold text-slate-900">Manager dashboard shell</h3>
+        <p class="mt-2 text-sm text-slate-500">
+            We’ll plug the real charts, team views, and project blocks into this page next.
+        </p>
+    </div>
+</div>