Merge remote changes and apply TaskStatus/TaskPriority enum refactoring

.gitignore

@@ -266,6 +266,9 @@ ServiceFabricBackup/
 *.ldf
 *.ndf
 
+# Firebase service account keys
+TaskTrackingSystem.WebApi/Firebase/*.json
+
 # Business Intelligence projects
 *.rdl.data
 *.bim.layout
@@ -360,4 +363,4 @@ MigrationBackup/
 .ionide/
 
 # Fody - auto-generated XML schema
-FodyWeavers.xsd
+FodyWeavers.xsd

TaskTrackingSystem.Database/AppDbContextModels/AppDbContext.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore;
+using TaskTrackingSystem.Shared.Enums;
 
 namespace TaskTrackingSystem.Database.AppDbContextModels;
 
@@ -23,6 +24,8 @@ public partial class AppDbContext : DbContext
 
     public virtual DbSet<Menu> Menus { get; set; }
 
+    public virtual DbSet<Notification> Notifications { get; set; }
+
     public virtual DbSet<Permission> Permissions { get; set; }
 
     public virtual DbSet<Project> Projects { get; set; }
@@ -41,6 +44,8 @@ public partial class AppDbContext : DbContext
 
     public virtual DbSet<TimeLog> TimeLogs { get; set; }
 
+    public virtual DbSet<UserDevice> UserDevices { get; set; }
+
     public virtual DbSet<User> Users { get; set; }
 
     protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
@@ -131,6 +136,35 @@ public partial class AppDbContext : DbContext
                 .HasConstraintName("FK_Menus_ParentMenu");
         });
 
+        modelBuilder.Entity<Notification>(entity =>
+        {
+            entity.ToTable("notifications");
+
+            entity.HasIndex(e => e.CreatedAt, "IX_notifications_CreatedAt");
+            entity.HasIndex(e => new { e.RecipientId, e.IsRead }, "IX_notifications_Recipient_IsRead");
+
+            entity.Property(e => e.CreatedAt).HasColumnName("created_at").HasColumnType("datetime2");
+            entity.Property(e => e.IsRead).HasColumnName("is_read").HasDefaultValue(false);
+            entity.Property(e => e.NotificationType).HasColumnName("notification_type");
+            entity.Property(e => e.Title).HasMaxLength(255);
+            entity.Property(e => e.Body).HasColumnType("nvarchar(max)");
+            entity.Property(e => e.ReadAt).HasColumnName("read_at").HasColumnType("datetime2");
+            entity.Property(e => e.RecipientId).HasColumnName("recipient_id");
+            entity.Property(e => e.SenderId).HasColumnName("sender_id");
+            entity.Property(e => e.SourceId).HasColumnName("source_id");
+            entity.Property(e => e.SourceType).HasColumnName("source_type").HasMaxLength(20);
+
+            entity.HasOne(d => d.Recipient).WithMany()
+                .HasForeignKey(d => d.RecipientId)
+                .OnDelete(DeleteBehavior.Cascade)
+                .HasConstraintName("FK_notifications_Users_Recipient");
+
+            entity.HasOne(d => d.Sender).WithMany()
+                .HasForeignKey(d => d.SenderId)
+                .OnDelete(DeleteBehavior.SetNull)
+                .HasConstraintName("FK_notifications_Users_Sender");
+        });
+
         modelBuilder.Entity<Permission>(entity =>
         {
             entity.HasIndex(e => e.MenuId, "IX_Permissions_MenuId");
@@ -263,8 +297,8 @@ public partial class AppDbContext : DbContext
                 .HasColumnType("datetime");
             entity.Property(e => e.DueDate).HasColumnType("datetime");
             entity.Property(e => e.EstimatedHours).HasColumnType("decimal(5, 2)");
-            entity.Property(e => e.PriorityId).HasDefaultValue(2L);
-            entity.Property(e => e.StatusId).HasDefaultValue(1L);
+            entity.Property(e => e.PriorityId).HasDefaultValue(TaskPriority.Medium);
+            entity.Property(e => e.StatusId).HasDefaultValue(AppTaskStatus.Todo);
             entity.Property(e => e.Title).HasMaxLength(200);
             entity.Property(e => e.UpdatedAt).HasColumnType("datetime");
 
@@ -350,6 +384,25 @@ public partial class AppDbContext : DbContext
                 .HasConstraintName("FK_Users_Roles");
         });
 
+        modelBuilder.Entity<UserDevice>(entity =>
+        {
+            entity.ToTable("user_devices");
+
+            entity.HasIndex(e => e.UserId, "IX_user_devices_UserId");
+
+            entity.HasIndex(e => e.FcmToken, "UQ_user_devices_FcmToken").IsUnique();
+
+            entity.Property(e => e.UserId).HasColumnName("user_id");
+            entity.Property(e => e.FcmToken).HasColumnName("fcm_token").HasMaxLength(255);
+            entity.Property(e => e.CreatedAt).HasColumnName("created_at").HasColumnType("datetime2");
+            entity.Property(e => e.UpdatedAt).HasColumnName("updated_at").HasColumnType("datetime2");
+
+            entity.HasOne(d => d.User).WithMany()
+                .HasForeignKey(d => d.UserId)
+                .OnDelete(DeleteBehavior.Cascade)
+                .HasConstraintName("FK_user_devices_Users");
+        });
+
         OnModelCreatingPartial(modelBuilder);
     }
 

TaskTrackingSystem.Database/AppDbContextModels/Notification.cs

@@ -0,0 +1,32 @@
+using System;
+
+namespace TaskTrackingSystem.Database.AppDbContextModels;
+
+public partial class Notification
+{
+    public long Id { get; set; }
+
+    public long RecipientId { get; set; }
+
+    public long? SenderId { get; set; }
+
+    public byte NotificationType { get; set; }
+
+    public string Title { get; set; } = null!;
+
+    public string Body { get; set; } = null!;
+
+    public string SourceType { get; set; } = null!;
+
+    public long SourceId { get; set; }
+
+    public bool IsRead { get; set; }
+
+    public DateTime? ReadAt { get; set; }
+
+    public DateTime? CreatedAt { get; set; }
+
+    public virtual User Recipient { get; set; } = null!;
+
+    public virtual User? Sender { get; set; }
+}

TaskTrackingSystem.Database/AppDbContextModels/Task.cs

@@ -1,5 +1,6 @@
-using System;
+using System;
 using System.Collections.Generic;
+using TaskTrackingSystem.Shared.Enums;
 
 namespace TaskTrackingSystem.Database.AppDbContextModels;
 
@@ -13,9 +14,9 @@ public partial class Task
 
     public long ProjectId { get; set; }
 
-    public long StatusId { get; set; }
+    public AppTaskStatus StatusId { get; set; }
 
-    public long PriorityId { get; set; }
+    public TaskPriority PriorityId { get; set; }
 
     public long? AssignedTo { get; set; }
 

TaskTrackingSystem.Database/AppDbContextModels/TaskHistory.cs

@@ -1,5 +1,6 @@
-using System;
+using System;
 using System.Collections.Generic;
+using TaskTrackingSystem.Shared.Enums;
 
 namespace TaskTrackingSystem.Database.AppDbContextModels;
 
@@ -11,13 +12,13 @@ public partial class TaskHistory
 
     public long ModifiedById { get; set; }
 
-    public long? OldStatusId { get; set; }
+    public AppTaskStatus? OldStatusId { get; set; }
 
-    public long? NewStatusId { get; set; }
+    public AppTaskStatus? NewStatusId { get; set; }
 
-    public long? OldPriorityId { get; set; }
+    public TaskPriority? OldPriorityId { get; set; }
 
-    public long? NewPriorityId { get; set; }
+    public TaskPriority? NewPriorityId { get; set; }
 
     public string? Remarks { get; set; }
 

TaskTrackingSystem.Database/AppDbContextModels/UserDevice.cs

@@ -0,0 +1,18 @@
+using System;
+
+namespace TaskTrackingSystem.Database.AppDbContextModels;
+
+public partial class UserDevice
+{
+    public long Id { get; set; }
+
+    public long UserId { get; set; }
+
+    public string FcmToken { get; set; } = null!;
+
+    public DateTime? CreatedAt { get; set; }
+
+    public DateTime? UpdatedAt { get; set; }
+
+    public virtual User User { get; set; } = null!;
+}

TaskTrackingSystem.Database/TaskTrackingSystem.Database.csproj

@@ -20,5 +20,8 @@
 		</PackageReference>
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
 	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\TaskTrackingSystem.Shared\TaskTrackingSystem.Shared.csproj" />
+	</ItemGroup>
 
 </Project>

TaskTrackingSystem.Shared/Enums/EnumAdminMenuCode.cs

@@ -1,37 +0,0 @@
-using System;
-using System.ComponentModel;
-
-namespace TaskTrackingSystem.Shared.Enums
-{
-    public enum EnumAdminAction
-    {
-        Approve,
-        Reject,
-        Create,
-        Edit,
-        Update,
-        Delete,
-        Detail,
-    }
-
-    public enum EnumAdminMenuCode
-    {
-        Dashboard,
-        [Description("CMC001")] ProjectList,
-        [Description("CMC002")] TaskList,
-        [Description("CMC003")] UserList,
-        [Description("CMC004")] RoleList,
-        [Description("CMC005")] ReportList,
-    }
-
-    public enum EnumAdminActionCode
-    {
-        Approve,
-        Reject,
-        Create,
-        Edit,
-        Update,
-        Delete,
-        Detail,
-    }
-}

TaskTrackingSystem.Shared/Enums/TaskPriority.cs

@@ -0,0 +1,11 @@
+using System;
+
+namespace TaskTrackingSystem.Shared.Enums
+{
+    public enum TaskPriority : long
+    {
+        Low = 1,
+        Medium = 2,
+        High = 3
+    }
+}

TaskTrackingSystem.Shared/Enums/TaskStatus.cs

@@ -0,0 +1,11 @@
+using System;
+
+namespace TaskTrackingSystem.Shared.Enums
+{
+    public enum AppTaskStatus : long
+    {
+        Todo = 1,
+        InProgress = 2,
+        Done = 3
+    }
+}

TaskTrackingSystem.Shared/Models/Dashboard/TaskStatusOverviewDto.cs

@@ -1,9 +1,12 @@
+using TaskTrackingSystem.Shared.Enums;
+using AppTaskStatus = TaskTrackingSystem.Shared.Enums.AppTaskStatus;
+
 namespace TaskTrackingSystem.Shared.Models.Dashboard
 {
     public class TaskStatusOverviewDto
     {
         public string StatusName { get; set; } = string.Empty;
-        public long StatusId { get; set; }
+        public AppTaskStatus StatusId { get; set; }
         public int TaskCount { get; set; }
     }
 }

TaskTrackingSystem.Shared/Models/Notification/NotificationDto.cs

@@ -0,0 +1,17 @@
+using System;
+
+namespace TaskTrackingSystem.Shared.Models.Notification;
+
+public class NotificationDto
+{
+    public long Id { get; set; }
+    public string Title { get; set; } = string.Empty;
+    public string Body { get; set; } = string.Empty;
+    public byte NotificationType { get; set; }
+    public string SourceType { get; set; } = string.Empty;
+    public long SourceId { get; set; }
+    public bool IsRead { get; set; }
+    public DateTime? CreatedAt { get; set; }
+    public DateTime? ReadAt { get; set; }
+    public string? SenderName { get; set; }
+}

TaskTrackingSystem.Shared/Models/Notification/NotificationType.cs

@@ -0,0 +1,14 @@
+namespace TaskTrackingSystem.Shared.Models.Notification;
+
+public enum NotificationType : byte
+{
+    TaskAssigned = 1,
+    StatusChanged = 2,
+    DueDateReminder = 3,
+    OverdueAlert = 4,
+    CommentAdded = 5,
+    Mention = 6,
+    PriorityChanged = 7,
+    ProjectUpdated = 8,
+    System = 9
+}

TaskTrackingSystem.Shared/Models/Notification/RegisterDeviceTokenDto.cs

@@ -0,0 +1,6 @@
+namespace TaskTrackingSystem.Shared.Models.Notification;
+
+public class RegisterDeviceTokenDto
+{
+    public string FcmToken { get; set; } = string.Empty;
+}

TaskTrackingSystem.Shared/Models/Report/TaskReportDto.cs

@@ -1,4 +1,6 @@
 using System;
+using TaskTrackingSystem.Shared.Enums;
+using AppTaskStatus = TaskTrackingSystem.Shared.Enums.AppTaskStatus;
 
 namespace TaskTrackingSystem.Shared.Models.Report
 {
@@ -9,9 +11,9 @@ namespace TaskTrackingSystem.Shared.Models.Report
         public string? Description { get; set; }
         public string ProjectName { get; set; } = string.Empty;
         public long ProjectId { get; set; }
-        public long StatusId { get; set; }
+        public AppTaskStatus StatusId { get; set; }
         public string StatusName { get; set; } = string.Empty;
-        public long PriorityId { get; set; }
+        public TaskPriority PriorityId { get; set; }
         public string PriorityName { get; set; } = string.Empty;
         public string? AssignedToUser { get; set; }
         public long? AssignedToUserId { get; set; }

TaskTrackingSystem.Shared/Models/Report/TimeTrackingReportDto.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using TaskTrackingSystem.Shared.Enums;
+using AppTaskStatus = TaskTrackingSystem.Shared.Enums.AppTaskStatus;
 
 namespace TaskTrackingSystem.Shared.Models.Report
 {
@@ -54,6 +56,6 @@ namespace TaskTrackingSystem.Shared.Models.Report
         public decimal? EstimatedHours { get; set; }
         public decimal CompletedHours { get; set; }
         public DateTime DueDate { get; set; }
-        public long StatusId { get; set; }
+        public AppTaskStatus StatusId { get; set; }
     }
 }

TaskTrackingSystem.Shared/Models/Task/CreateTaskDto.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using TaskTrackingSystem.Shared.Enums;
+using AppTaskStatus = TaskTrackingSystem.Shared.Enums.AppTaskStatus;
 
 namespace TaskTrackingSystem.Shared.Models.Task
 {
@@ -16,11 +18,11 @@ namespace TaskTrackingSystem.Shared.Models.Task
         [Range(1, long.MaxValue)]
         public long ProjectId { get; set; }
 
-        [Range(0, 3)]
-        public long StatusId { get; set; }
+        [EnumDataType(typeof(AppTaskStatus))]
+        public AppTaskStatus StatusId { get; set; }
 
-        [Range(0, 3)]
-        public long PriorityId { get; set; }
+        [EnumDataType(typeof(TaskPriority))]
+        public TaskPriority PriorityId { get; set; }
 
         [Range(0, long.MaxValue)]
         public long? AssignedTo { get; set; }

TaskTrackingSystem.Shared/Models/Task/TaskDto.cs

@@ -2,7 +2,8 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
+using TaskTrackingSystem.Shared.Enums;
+using AppTaskStatus = TaskTrackingSystem.Shared.Enums.AppTaskStatus;
 
 namespace TaskTrackingSystem.Shared.Models.Task
 {
@@ -12,8 +13,8 @@ namespace TaskTrackingSystem.Shared.Models.Task
         public string Title { get; set; } = string.Empty;
         public string? Description { get; set; }
         public long ProjectId { get; set; }
-        public long StatusId { get; set; }
-        public long PriorityId { get; set; }
+        public AppTaskStatus StatusId { get; set; }
+        public TaskPriority PriorityId { get; set; }
         public long? AssignedTo { get; set; }
         public long? AssignedBy { get; set; }
         public decimal? EstimatedHours { get; set; }

TaskTrackingSystem.Shared/Models/Task/UpdateTaskDto.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using TaskTrackingSystem.Shared.Enums;
+using AppTaskStatus = TaskTrackingSystem.Shared.Enums.AppTaskStatus;
 
 namespace TaskTrackingSystem.Shared.Models.Task
 {
@@ -13,12 +15,12 @@ namespace TaskTrackingSystem.Shared.Models.Task
         public string? Description { get; set; }
 
         [Required]
-        [Range(0, 3)]
-        public long StatusId { get; set; }
+        [EnumDataType(typeof(AppTaskStatus))]
+        public AppTaskStatus StatusId { get; set; }
 
         [Required]
-        [Range(0, 3)]
-        public long PriorityId { get; set; }
+        [EnumDataType(typeof(TaskPriority))]
+        public TaskPriority PriorityId { get; set; }
 
         [Range(0, long.MaxValue)]
         public long? AssignedTo { get; set; }

TaskTrackingSystem.WebApi/Features/Dashboard/DashboardService.cs

@@ -6,6 +6,7 @@ using System.Threading.Tasks;
 using TaskTrackingSystem.Database.AppDbContextModels;
 using TaskTrackingSystem.Shared;
 using TaskTrackingSystem.Shared.Models.Dashboard;
+using TaskTrackingSystem.Shared.Enums;
 
 namespace TaskTrackingSystem.WebApi.Features.Dashboard
 {
@@ -33,7 +34,7 @@ namespace TaskTrackingSystem.WebApi.Features.Dashboard
                     .CountAsync();
 
             var activeProjectsCount = await projects.CountAsync();
-            var pendingTasksCount = await tasks.CountAsync(t => t.StatusId != 3);
+            var pendingTasksCount = await tasks.CountAsync(t => t.StatusId != AppTaskStatus.Done);
 
             var summary = new DashboardSummaryDto
             {
@@ -57,11 +58,11 @@ namespace TaskTrackingSystem.WebApi.Features.Dashboard
                 .ToListAsync();
 
             // Status mappings (StatusId 1 = To Do, 2 = In Progress, 3 = Done etc.)
-            var statusMap = new Dictionary<long, string>
+            var statusMap = new Dictionary<AppTaskStatus, string>
             {
-                { 1, "To Do" },
-                { 2, "In Progress" },
-                { 3, "Done" }
+                { AppTaskStatus.Todo, "To Do" },
+                { AppTaskStatus.InProgress, "In Progress" },
+                { AppTaskStatus.Done, "Done" }
             };
 
             var overview = groupedTasks.Select(gt => new TaskStatusOverviewDto
@@ -102,7 +103,7 @@ namespace TaskTrackingSystem.WebApi.Features.Dashboard
                     .ToListAsync();
 
                 int totalTasks = tasks.Count;
-                int completedTasks = tasks.Count(t => t.StatusId == 3); // StatusId 3 = Done
+                int completedTasks = tasks.Count(t => t.StatusId == AppTaskStatus.Done); // StatusId 3 = Done
 
                 double percentage = totalTasks > 0 ? Math.Round(((double)completedTasks / totalTasks) * 100, 2) : 0;
 

TaskTrackingSystem.WebApi/Features/Notification/FirebaseNotificationService.cs

@@ -0,0 +1,333 @@
+using System.Security.Claims;
+using System.Security.Cryptography;
+using System.Text;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Hosting;
+using TaskTrackingSystem.Database.AppDbContextModels;
+using TaskTrackingSystem.Shared.Models.Notification;
+using TaskTrackingSystem.Shared.Enums;
+using DbNotification = TaskTrackingSystem.Database.AppDbContextModels.Notification;
+
+namespace TaskTrackingSystem.WebApi.Features.Notification;
+
+public class FirebaseNotificationService
+{
+    private static readonly SemaphoreSlim AccessTokenLock = new(1, 1);
+    private static string? CachedAccessToken;
+    private static DateTimeOffset CachedAccessTokenExpiresAt;
+
+    private readonly AppDbContext _db;
+    private readonly IHttpClientFactory _httpClientFactory;
+    private readonly string _serviceAccountPath;
+
+    public FirebaseNotificationService(
+        AppDbContext db,
+        IHttpClientFactory httpClientFactory,
+        IHostEnvironment environment,
+        IConfiguration configuration)
+    {
+        _db = db;
+        _httpClientFactory = httpClientFactory;
+
+        var configuredPath = configuration["Firebase:ServiceAccountPath"] ?? "Firebase/ttsfirebasekey.json";
+        _serviceAccountPath = Path.IsPathRooted(configuredPath)
+            ? configuredPath
+            : Path.Combine(environment.ContentRootPath, configuredPath);
+    }
+
+    public global::System.Threading.Tasks.Task NotifyTaskAssignedAsync(Database.AppDbContextModels.Task task, long senderId)
+    {
+        if (!task.AssignedTo.HasValue)
+        {
+            return global::System.Threading.Tasks.Task.CompletedTask;
+        }
+
+        var title = "Task assigned";
+        var body = $"You have been assigned a new task: {task.Title}";
+
+        return SendAsync(
+            recipientIds: new[] { task.AssignedTo.Value },
+            senderId: senderId,
+            notificationType: NotificationType.TaskAssigned,
+            sourceType: "task",
+            sourceId: task.Id,
+            title: title,
+            body: body);
+    }
+
+    public async global::System.Threading.Tasks.Task NotifyTaskStatusChangedAsync(Database.AppDbContextModels.Task task, long senderId, AppTaskStatus oldStatusId, AppTaskStatus newStatusId)
+    {
+        var recipientIds = BuildTaskAudience(task, senderId);
+        if (recipientIds.Count == 0)
+        {
+            return;
+        }
+
+        var title = "Task status changed";
+        var body = $"Task '{task.Title}' changed from {GetStatusLabel(oldStatusId)} to {GetStatusLabel(newStatusId)}";
+
+        await SendAsync(
+            recipientIds,
+            senderId,
+            NotificationType.StatusChanged,
+            "task",
+            task.Id,
+            title,
+            body);
+    }
+
+    public async global::System.Threading.Tasks.Task NotifyCommentAddedAsync(Database.AppDbContextModels.Task task, long senderId, string actorName)
+    {
+        var recipientIds = BuildTaskAudience(task, senderId);
+        if (recipientIds.Count == 0)
+        {
+            return;
+        }
+
+        var title = "New comment";
+        var body = $"{actorName} commented on task '{task.Title}'";
+
+        await SendAsync(
+            recipientIds,
+            senderId,
+            NotificationType.CommentAdded,
+            "task",
+            task.Id,
+            title,
+            body);
+    }
+
+    private List<long> BuildTaskAudience(Database.AppDbContextModels.Task task, long senderId)
+    {
+        var audience = new HashSet<long>();
+
+        if (task.AssignedTo.HasValue && task.AssignedTo.Value != senderId)
+        {
+            audience.Add(task.AssignedTo.Value);
+        }
+
+        if (task.AssignedBy.HasValue && task.AssignedBy.Value != senderId)
+        {
+            audience.Add(task.AssignedBy.Value);
+        }
+
+        if (task.CreatedBy.HasValue && task.CreatedBy.Value != senderId)
+        {
+            audience.Add(task.CreatedBy.Value);
+        }
+
+        return audience.ToList();
+    }
+
+    private async global::System.Threading.Tasks.Task SendAsync(
+        IEnumerable<long> recipientIds,
+        long senderId,
+        NotificationType notificationType,
+        string sourceType,
+        long sourceId,
+        string title,
+        string body)
+    {
+        var uniqueRecipientIds = recipientIds.Distinct().ToList();
+        if (uniqueRecipientIds.Count == 0)
+        {
+            return;
+        }
+
+        var notifications = uniqueRecipientIds.Select(recipientId => new DbNotification
+        {
+            RecipientId = recipientId,
+            SenderId = senderId > 0 ? senderId : null,
+            NotificationType = (byte)notificationType,
+            Title = title,
+            Body = body,
+            SourceType = sourceType,
+            SourceId = sourceId,
+            IsRead = false,
+            CreatedAt = DateTime.UtcNow
+        }).ToList();
+
+        _db.Notifications.AddRange(notifications);
+        await _db.SaveChangesAsync();
+
+        var tokens = await _db.UserDevices
+            .Where(d => uniqueRecipientIds.Contains(d.UserId))
+            .Select(d => d.FcmToken)
+            .Distinct()
+            .ToListAsync();
+
+        foreach (var token in tokens)
+        {
+            await SendPushAsync(token, title, body, sourceType, sourceId, notificationType);
+        }
+    }
+
+    private async global::System.Threading.Tasks.Task SendPushAsync(
+        string token,
+        string title,
+        string body,
+        string sourceType,
+        long sourceId,
+        NotificationType notificationType)
+    {
+        var serviceAccount = await LoadServiceAccountAsync();
+        var accessToken = await GetAccessTokenAsync(serviceAccount);
+
+        var client = _httpClientFactory.CreateClient();
+        var request = new HttpRequestMessage(HttpMethod.Post, $"https://fcm.googleapis.com/v1/projects/{serviceAccount.ProjectId}/messages:send");
+        request.Headers.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer", accessToken);
+
+        var payload = new
+        {
+            message = new
+            {
+                token,
+                notification = new
+                {
+                    title,
+                    body
+                },
+                data = new Dictionary<string, string>
+                {
+                    ["sourceType"] = sourceType,
+                    ["sourceId"] = sourceId.ToString(),
+                    ["notificationType"] = ((byte)notificationType).ToString()
+                }
+            }
+        };
+
+        request.Content = new StringContent(JsonSerializer.Serialize(payload), Encoding.UTF8, "application/json");
+        using var response = await client.SendAsync(request);
+        if (!response.IsSuccessStatusCode)
+        {
+            var error = await response.Content.ReadAsStringAsync();
+            Console.WriteLine($"[Firebase] Failed to send push: {(int)response.StatusCode} {response.ReasonPhrase}. {error}");
+        }
+    }
+
+    private async global::System.Threading.Tasks.Task<string> GetAccessTokenAsync(FirebaseServiceAccount serviceAccount)
+    {
+        if (!string.IsNullOrWhiteSpace(CachedAccessToken) && CachedAccessTokenExpiresAt > DateTimeOffset.UtcNow.AddMinutes(1))
+        {
+            return CachedAccessToken!;
+        }
+
+        await AccessTokenLock.WaitAsync();
+        try
+        {
+            if (!string.IsNullOrWhiteSpace(CachedAccessToken) && CachedAccessTokenExpiresAt > DateTimeOffset.UtcNow.AddMinutes(1))
+            {
+                return CachedAccessToken!;
+            }
+
+            var iat = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
+            var exp = iat + 3600;
+
+            var headerJson = JsonSerializer.Serialize(new { alg = "RS256", typ = "JWT" });
+            var claimJson = JsonSerializer.Serialize(new
+            {
+                iss = serviceAccount.ClientEmail,
+                scope = "https://www.googleapis.com/auth/firebase.messaging",
+                aud = "https://oauth2.googleapis.com/token",
+                iat,
+                exp
+            });
+
+            var unsignedJwt = $"{Base64UrlEncode(Encoding.UTF8.GetBytes(headerJson))}.{Base64UrlEncode(Encoding.UTF8.GetBytes(claimJson))}";
+            var signature = SignJwt(unsignedJwt, serviceAccount.PrivateKey);
+            var assertion = $"{unsignedJwt}.{Base64UrlEncode(signature)}";
+
+            var client = _httpClientFactory.CreateClient();
+            var form = new FormUrlEncodedContent(new[]
+            {
+                new KeyValuePair<string, string>("grant_type", "urn:ietf:params:oauth:grant-type:jwt-bearer"),
+                new KeyValuePair<string, string>("assertion", assertion)
+            });
+
+            using var response = await client.PostAsync("https://oauth2.googleapis.com/token", form);
+            response.EnsureSuccessStatusCode();
+
+            var json = await response.Content.ReadAsStringAsync();
+            using var doc = JsonDocument.Parse(json);
+            var token = doc.RootElement.GetProperty("access_token").GetString();
+            var expiresIn = doc.RootElement.GetProperty("expires_in").GetInt32();
+
+            if (string.IsNullOrWhiteSpace(token))
+            {
+                throw new InvalidOperationException("Firebase access token response did not contain an access_token.");
+            }
+
+            CachedAccessToken = token;
+            CachedAccessTokenExpiresAt = DateTimeOffset.UtcNow.AddSeconds(expiresIn);
+
+            return token;
+        }
+        finally
+        {
+            AccessTokenLock.Release();
+        }
+    }
+
+    private async global::System.Threading.Tasks.Task<FirebaseServiceAccount> LoadServiceAccountAsync()
+    {
+        var json = await File.ReadAllTextAsync(_serviceAccountPath);
+        var serviceAccount = JsonSerializer.Deserialize<FirebaseServiceAccount>(json);
+        if (serviceAccount == null ||
+            string.IsNullOrWhiteSpace(serviceAccount.ProjectId) ||
+            string.IsNullOrWhiteSpace(serviceAccount.ClientEmail) ||
+            string.IsNullOrWhiteSpace(serviceAccount.PrivateKey))
+        {
+            throw new InvalidOperationException("Firebase service account file is missing required fields.");
+        }
+
+        return serviceAccount;
+    }
+
+    private static byte[] SignJwt(string unsignedJwt, string privateKey)
+    {
+        var pem = privateKey
+            .Replace("\\n", "\n", StringComparison.Ordinal)
+            .Replace("-----BEGIN PRIVATE KEY-----", string.Empty, StringComparison.Ordinal)
+            .Replace("-----END PRIVATE KEY-----", string.Empty, StringComparison.Ordinal)
+            .Replace("\r", string.Empty, StringComparison.Ordinal)
+            .Replace("\n", string.Empty, StringComparison.Ordinal)
+            .Trim();
+
+        var keyBytes = Convert.FromBase64String(pem);
+        using var rsa = RSA.Create();
+        rsa.ImportPkcs8PrivateKey(keyBytes, out _);
+
+        return rsa.SignData(Encoding.ASCII.GetBytes(unsignedJwt), HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
+    }
+
+    private static string Base64UrlEncode(byte[] input)
+    {
+        return Convert.ToBase64String(input)
+            .TrimEnd('=')
+            .Replace('+', '-')
+            .Replace('/', '_');
+    }
+
+    private static string GetStatusLabel(AppTaskStatus statusId) => statusId switch
+    {
+        AppTaskStatus.Todo => "To Do",
+        AppTaskStatus.InProgress => "In Progress",
+        AppTaskStatus.Done => "Done",
+        _ => $"Status {statusId}"
+    };
+
+    private sealed class FirebaseServiceAccount
+    {
+        [JsonPropertyName("project_id")]
+        public string ProjectId { get; set; } = string.Empty;
+
+        [JsonPropertyName("client_email")]
+        public string ClientEmail { get; set; } = string.Empty;
+
+        [JsonPropertyName("private_key")]
+        public string PrivateKey { get; set; } = string.Empty;
+    }
+}

TaskTrackingSystem.WebApi/Features/Notification/NotificationController.cs

@@ -0,0 +1,58 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using TaskTrackingSystem.Shared;
+using TaskTrackingSystem.WebApi.Infrastructure;
+
+namespace TaskTrackingSystem.WebApi.Features.Notification;
+
+[ApiController]
+[Authorize]
+[Route("api/[controller]")]
+public class NotificationController : ControllerBase
+{
+    private readonly NotificationService _notificationService;
+
+    public NotificationController(NotificationService notificationService)
+    {
+        _notificationService = notificationService;
+    }
+
+    [HttpGet("mine")]
+    public async Task<ActionResult<IEnumerable<TaskTrackingSystem.Shared.Models.Notification.NotificationDto>>> GetMine([FromQuery] int take = 10)
+    {
+        var userId = User.GetUserId();
+        if (userId <= 0)
+        {
+            return Unauthorized();
+        }
+
+        var items = await _notificationService.GetRecentAsync(userId, take);
+        return Ok(items);
+    }
+
+    [HttpGet("unread-count")]
+    public async Task<ActionResult<int>> GetUnreadCount()
+    {
+        var userId = User.GetUserId();
+        if (userId <= 0)
+        {
+            return Unauthorized();
+        }
+
+        var count = await _notificationService.GetUnreadCountAsync(userId);
+        return Ok(count);
+    }
+
+    [HttpPost("{id}/read")]
+    public async Task<ActionResult<Result>> MarkRead(long id)
+    {
+        var userId = User.GetUserId();
+        if (userId <= 0)
+        {
+            return Unauthorized(Result.Failure("User is not authenticated.", 401));
+        }
+
+        var result = await _notificationService.MarkReadAsync(userId, id);
+        return StatusCode(result.StatusCode, result);
+    }
+}

TaskTrackingSystem.WebApi/Features/Notification/NotificationService.cs

@@ -0,0 +1,67 @@
+using Microsoft.EntityFrameworkCore;
+using TaskTrackingSystem.Database.AppDbContextModels;
+using TaskTrackingSystem.Shared;
+using TaskTrackingSystem.Shared.Models.Notification;
+using DbNotification = TaskTrackingSystem.Database.AppDbContextModels.Notification;
+
+namespace TaskTrackingSystem.WebApi.Features.Notification;
+
+public class NotificationService
+{
+    private readonly AppDbContext _db;
+
+    public NotificationService(AppDbContext db)
+    {
+        _db = db;
+    }
+
+    public async Task<IReadOnlyList<NotificationDto>> GetRecentAsync(long userId, int take = 10)
+    {
+        return await (
+            from n in _db.Notifications
+            where n.RecipientId == userId
+            join sender in _db.Users on n.SenderId equals sender.Id into senderGroup
+            from sender in senderGroup.DefaultIfEmpty()
+            orderby n.CreatedAt descending
+            select new NotificationDto
+            {
+                Id = n.Id,
+                Title = n.Title,
+                Body = n.Body,
+                NotificationType = n.NotificationType,
+                SourceType = n.SourceType,
+                SourceId = n.SourceId,
+                IsRead = n.IsRead,
+                CreatedAt = n.CreatedAt,
+                ReadAt = n.ReadAt,
+                SenderName = sender == null ? null : $"{sender.FirstName} {sender.LastName}"
+            })
+            .Take(take)
+            .ToListAsync();
+    }
+
+    public async Task<int> GetUnreadCountAsync(long userId)
+    {
+        return await _db.Notifications.CountAsync(n => n.RecipientId == userId && !n.IsRead);
+    }
+
+    public async Task<Result> MarkReadAsync(long userId, long notificationId)
+    {
+        var notification = await _db.Notifications
+            .FirstOrDefaultAsync(n => n.Id == notificationId && n.RecipientId == userId);
+
+        if (notification == null)
+        {
+            return Result.Failure("Notification not found.", 404);
+        }
+
+        if (!notification.IsRead)
+        {
+            notification.IsRead = true;
+            notification.ReadAt = DateTime.UtcNow;
+            await _db.SaveChangesAsync();
+        }
+
+        return Result.Success();
+    }
+}

TaskTrackingSystem.WebApi/Features/Project/ProjectService.cs

@@ -8,6 +8,7 @@ using TaskTrackingSystem.Shared;
 using TaskTrackingSystem.Shared.Models.User;
 using TaskTrackingSystem.Shared.Models.Task;
 using TaskTrackingSystem.Shared.Models.Project;
+using TaskTrackingSystem.Shared.Enums;
 
 namespace TaskTrackingSystem.WebApi.Features.Project
 {
@@ -136,6 +137,22 @@ namespace TaskTrackingSystem.WebApi.Features.Project
 
             project.IsDeleted = true;
             _db.Projects.Update(project);
+
+            // Soft-delete all tasks associated with this project
+            var tasksToUpdate = await _db.Tasks
+                .Where(t => t.ProjectId == id && t.IsDeleted != true)
+                .ToListAsync();
+            foreach (var task in tasksToUpdate)
+            {
+                task.IsDeleted = true;
+                task.UpdatedAt = DateTime.UtcNow;
+                task.UpdatedBy = currentUserId;
+            }
+            if (tasksToUpdate.Any())
+            {
+                _db.Tasks.UpdateRange(tasksToUpdate);
+            }
+
             await _db.SaveChangesAsync();
             return Result.Success(200);
         }
@@ -277,7 +294,7 @@ namespace TaskTrackingSystem.WebApi.Features.Project
                     DueDate = t.DueDate,
                     CreatedAt = t.CreatedAt ?? DateTime.UtcNow,
                     CompletedAt = t.TaskHistories
-                        .Where(th => th.NewStatusId == 3)
+                        .Where(th => th.NewStatusId == AppTaskStatus.Done)
                         .OrderBy(th => th.CreatedAt)
                         .Select(th => th.CreatedAt)
                         .FirstOrDefault()

TaskTrackingSystem.WebApi/Features/Report/ReportController.cs

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using TaskTrackingSystem.Shared;
 using TaskTrackingSystem.Shared.Models.Report;
+using TaskTrackingSystem.Shared.Enums;
 using TaskTrackingSystem.WebApi.Infrastructure;
 
 namespace TaskTrackingSystem.WebApi.Features.Report
@@ -21,7 +22,7 @@ namespace TaskTrackingSystem.WebApi.Features.Report
             _reportService = reportService;
         }
 
-        // ─── Legacy ───────────────────────────────────────────────────────────────
+        // ─── Legacy ───────────────────────────────────────────────────────────────
 
         [HttpGet("tasks")]
         public async Task<ActionResult<Result<IEnumerable<TaskReportDto>>>> GetTasksReport(
@@ -41,12 +42,12 @@ namespace TaskTrackingSystem.WebApi.Features.Report
             return StatusCode(result.StatusCode, result);
         }
 
-        // ─── Report 1: Task Status Summary ────────────────────────────────────────
+        // ─── Report 1: Task Status Summary ────────────────────────────────────────
 
         [HttpGet("task-status-summary")]
         public async Task<ActionResult<Result<IEnumerable<TaskStatusSummaryDto>>>> GetTaskStatusSummary(
             [FromQuery] string? search,
-            [FromQuery] long? statusId,
+            [FromQuery] AppTaskStatus? statusId,
             [FromQuery] long? projectId)
         {
             var result = await _reportService.GetTaskStatusSummaryAsync(search, statusId, projectId, User.GetRoleName(), User.GetUserId());
@@ -56,7 +57,7 @@ namespace TaskTrackingSystem.WebApi.Features.Report
         [HttpGet("task-status-summary/excel")]
         public async Task<IActionResult> DownloadTaskStatusSummaryExcel(
             [FromQuery] string? search,
-            [FromQuery] long? statusId,
+            [FromQuery] AppTaskStatus? statusId,
             [FromQuery] long? projectId)
         {
             var result = await _reportService.GetTaskStatusSummaryAsync(search, statusId, projectId, User.GetRoleName(), User.GetUserId());
@@ -67,7 +68,7 @@ namespace TaskTrackingSystem.WebApi.Features.Report
                         $"TaskStatusSummary_{DateTime.Today:yyyyMMdd}.xlsx");
         }
 
-        // ─── Report 2: Team Productivity ──────────────────────────────────────────
+        // ─── Report 2: Team Productivity ──────────────────────────────────────────
 
         [HttpGet("team-productivity")]
         public async Task<ActionResult<Result<IEnumerable<TeamProductivityReportDto>>>> GetTeamProductivity(
@@ -88,7 +89,7 @@ namespace TaskTrackingSystem.WebApi.Features.Report
                         $"TeamProductivity_{DateTime.Today:yyyyMMdd}.xlsx");
         }
 
-        // ─── Report 3: Overdue & Critical Tasks ───────────────────────────────────
+        // ─── Report 3: Overdue & Critical Tasks ───────────────────────────────────
 
         [HttpGet("overdue-critical")]
         public async Task<ActionResult<Result<IEnumerable<OverdueCriticalTaskDto>>>> GetOverdueCritical(
@@ -112,13 +113,13 @@ namespace TaskTrackingSystem.WebApi.Features.Report
                         $"OverdueCriticalTasks_{DateTime.Today:yyyyMMdd}.xlsx");
         }
 
-        // ─── Report 4: Time Tracking ──────────────────────────────────────────────
+        // ─â��€â”€ Report 4: Time Tracking ──────────────────────────────────────────────
 
         [HttpGet("time-tracking")]
         public async Task<ActionResult<Result<TimeTrackingReportDto>>> GetTimeTracking(
             [FromQuery] string? search,
             [FromQuery] long? projectId,
-            [FromQuery] long? statusId)
+            [FromQuery] AppTaskStatus? statusId)
         {
             var result = await _reportService.GetTimeTrackingReportAsync(search, projectId, statusId, User.GetRoleName(), User.GetUserId());
             return StatusCode(result.StatusCode, result);

TaskTrackingSystem.WebApi/Features/Report/ReportService.cs

@@ -8,14 +8,15 @@ using System.Threading.Tasks;
 using TaskTrackingSystem.Database.AppDbContextModels;
 using TaskTrackingSystem.Shared;
 using TaskTrackingSystem.Shared.Models.Report;
+using TaskTrackingSystem.Shared.Enums;
 
 namespace TaskTrackingSystem.WebApi.Features.Report
 {
     public class ReportService
     {
         private readonly AppDbContext _db;
-        private static readonly Dictionary<long, string> StatusMap = new() { { 1, "To Do" }, { 2, "In Progress" }, { 3, "Done" } };
-        private static readonly Dictionary<long, string> PriorityMap = new() { { 1, "Low" }, { 2, "Medium" }, { 3, "High" } };
+        private static readonly Dictionary<AppTaskStatus, string> StatusMap = new() { { AppTaskStatus.Todo, "To Do" }, { AppTaskStatus.InProgress, "In Progress" }, { AppTaskStatus.Done, "Done" } };
+        private static readonly Dictionary<TaskPriority, string> PriorityMap = new() { { TaskPriority.Low, "Low" }, { TaskPriority.Medium, "Medium" }, { TaskPriority.High, "High" } };
 
         public ReportService(AppDbContext db)
         {
@@ -78,7 +79,7 @@ namespace TaskTrackingSystem.WebApi.Features.Report
 
             return users.Where(u => u.Id == currentUserId || accessibleUserIds.Contains(u.Id));
         }
-        // ─── Legacy endpoints (kept for backward compatibility) ───────────────────
+        // ─── Legacy endpoints (kept for backward compatibility) ───────────────────
 
         public async Task<Result<IEnumerable<TaskReportDto>>> GetTasksReportAsync(
             DateTime? startDate, DateTime? endDate, string? status, int? projectId, string roleName, long currentUserId)
@@ -97,13 +98,13 @@ namespace TaskTrackingSystem.WebApi.Features.Report
                 var sl = status.Trim().ToLower();
                 if (sl == "uncompleted")
                 {
-                    query = query.Where(t => t.StatusId != 3);
+                    query = query.Where(t => t.StatusId != AppTaskStatus.Done);
                 }
                 else
                 {
-                    long? sid = sl switch { "to do" => 1, "in progress" => 2, "done" => 3, _ => null };
+                    AppTaskStatus? sid = sl switch { "to do" => AppTaskStatus.Todo, "in progress" => AppTaskStatus.InProgress, "done" => AppTaskStatus.Done, _ => null };
                     if (sid.HasValue) query = query.Where(t => t.StatusId == sid.Value);
-                    else if (long.TryParse(status, out var pid)) query = query.Where(t => t.StatusId == pid);
+                    else if (Enum.TryParse<AppTaskStatus>(status, true, out var parsedStatus)) query = query.Where(t => t.StatusId == parsedStatus);
                 }
             }
 
@@ -167,17 +168,17 @@ namespace TaskTrackingSystem.WebApi.Features.Report
             return Result<IEnumerable<UserProductivityDto>>.Success(list);
         }
 
-        // ─── Report 1: Task Status Summary ────────────────────────────────────────
+        // ─── Report 1: Task Status Summary ────────────────────────────────────────
 
         public async Task<Result<IEnumerable<TaskStatusSummaryDto>>> GetTaskStatusSummaryAsync(
-            string? search, long? statusId, long? projectId, string roleName, long currentUserId)
+            string? search, AppTaskStatus? statusId, long? projectId, string roleName, long currentUserId)
         {
             var query = BuildAccessibleTaskQuery(roleName, currentUserId)
                 .Include(t => t.Project)
                 .Include(t => t.AssignedToNavigation)
                 .Where(t => t.IsDeleted != true);
 
-            if (statusId.HasValue && statusId > 0)
+            if (statusId.HasValue)
                 query = query.Where(t => t.StatusId == statusId.Value);
             if (projectId.HasValue && projectId > 0)
                 query = query.Where(t => t.ProjectId == projectId.Value);
@@ -243,7 +244,7 @@ namespace TaskTrackingSystem.WebApi.Features.Report
             return ms.ToArray();
         }
 
-        // ─── Report 2: Team Productivity ──────────────────────────────────────────
+        // ─── Report 2: Team Productivity ──────────────────────────────────────────
 
         public async Task<Result<IEnumerable<TeamProductivityReportDto>>> GetTeamProductivityAsync(string? search, string roleName, long currentUserId)
         {
@@ -262,11 +263,11 @@ namespace TaskTrackingSystem.WebApi.Features.Report
                     FullName = $"{u.FirstName} {u.LastName}".Trim(),
                     Username = u.Username,
                     TotalAssigned = uTasks.Count,
-                    Completed = uTasks.Count(t => t.StatusId == 3),
-                    InProgress = uTasks.Count(t => t.StatusId == 2),
-                    ToDo = uTasks.Count(t => t.StatusId == 1),
-                    Overdue = uTasks.Count(t => t.DueDate < now && t.StatusId != 3),
-                    CompletionRate = uTasks.Count > 0 ? Math.Round((double)uTasks.Count(t => t.StatusId == 3) / uTasks.Count * 100, 1) : 0
+                    Completed = uTasks.Count(t => t.StatusId == AppTaskStatus.Done),
+                    InProgress = uTasks.Count(t => t.StatusId == AppTaskStatus.InProgress),
+                    ToDo = uTasks.Count(t => t.StatusId == AppTaskStatus.Todo),
+                    Overdue = uTasks.Count(t => t.DueDate < now && t.StatusId != AppTaskStatus.Done),
+                    CompletionRate = uTasks.Count > 0 ? Math.Round((double)uTasks.Count(t => t.StatusId == AppTaskStatus.Done) / uTasks.Count * 100, 1) : 0
                 };
             }).ToList();
 
@@ -312,7 +313,7 @@ namespace TaskTrackingSystem.WebApi.Features.Report
             return ms.ToArray();
         }
 
-        // ─── Report 3: Overdue & Critical Tasks ───────────────────────────────────
+        // ─── Report 3: Overdue & Critical Tasks ───────────────────────────────────
 
         public async Task<Result<IEnumerable<OverdueCriticalTaskDto>>> GetOverdueCriticalTasksAsync(string? search, long? projectId, string roleName, long currentUserId)
         {
@@ -320,8 +321,8 @@ namespace TaskTrackingSystem.WebApi.Features.Report
             var query = BuildAccessibleTaskQuery(roleName, currentUserId)
                 .Include(t => t.Project)
                 .Include(t => t.AssignedToNavigation)
-                .Where(t => t.IsDeleted != true && t.StatusId != 3 &&
-                            (t.DueDate < now || t.PriorityId == 3)); // overdue OR high priority
+                .Where(t => t.IsDeleted != true && t.StatusId != AppTaskStatus.Done &&
+                            (t.DueDate < now || t.PriorityId == TaskPriority.High)); // overdue OR high priority
 
             if (projectId.HasValue && projectId > 0)
                 query = query.Where(t => t.ProjectId == projectId.Value);
@@ -388,7 +389,7 @@ namespace TaskTrackingSystem.WebApi.Features.Report
         }
 
         public async Task<Result<TimeTrackingReportDto>> GetTimeTrackingReportAsync(
-            string? search, long? projectId, long? statusId, string roleName, long currentUserId)
+            string? search, long? projectId, AppTaskStatus? statusId, string roleName, long currentUserId)
         {
             var query = BuildAccessibleTaskQuery(roleName, currentUserId)
                 .Include(t => t.Project)
@@ -398,7 +399,7 @@ namespace TaskTrackingSystem.WebApi.Features.Report
 
             if (projectId.HasValue && projectId > 0)
                 query = query.Where(t => t.ProjectId == projectId.Value);
-            if (statusId.HasValue && statusId > 0)
+            if (statusId.HasValue)
                 query = query.Where(t => t.StatusId == statusId.Value);
 
             var tasks = await query.ToListAsync();

TaskTrackingSystem.WebApi/Features/Role/RoleController.cs

@@ -46,7 +46,7 @@ namespace TaskTrackingSystem.WebApi.Features.Role
                 return Forbid();
             }
 
-            long? currentUserId = null;
+            long? currentUserId = User.GetUserId();
             var result = await _roleService.CreateRoleAsync(createRoleDto, currentUserId);
             return StatusCode(result.StatusCode, result);
         }
@@ -59,7 +59,7 @@ namespace TaskTrackingSystem.WebApi.Features.Role
                 return Forbid();
             }
 
-            long? currentUserId = null;
+            long? currentUserId = User.GetUserId();
             var result = await _roleService.UpdateRoleAsync(id, updateRoleDto, currentUserId);
             return StatusCode(result.StatusCode, result);
         }
@@ -72,7 +72,7 @@ namespace TaskTrackingSystem.WebApi.Features.Role
                 return Forbid();
             }
 
-            var result = await _roleService.SoftDeleteRoleAsync(id);
+            var result = await _roleService.SoftDeleteRoleAsync(id, User.GetUserId());
             return StatusCode(result.StatusCode, result);
         }
 
@@ -103,7 +103,7 @@ namespace TaskTrackingSystem.WebApi.Features.Role
                 return Forbid();
             }
 
-            var result = await _roleService.AssignAccessToRoleAsync(id, dto);
+            var result = await _roleService.AssignAccessToRoleAsync(id, dto, User.GetUserId());
             if (!result.IsSuccess)
             {
                 return StatusCode(result.StatusCode, new { message = result.ErrorMessage });

TaskTrackingSystem.WebApi/Features/Role/RoleService.cs

@@ -87,7 +87,10 @@ namespace TaskTrackingSystem.WebApi.Features.Role
 
             await _auditLog.LogAsync("Create", "Role", $"Created new role '{role.Name}'");
 
-            var assignResult = await AssignAccessToRoleAsync(role.Id, new AssignAccessDto { AccessCodes = dto.AccessCodes ?? new List<string>() });
+            var assignResult = await AssignAccessToRoleAsync(
+                role.Id,
+                new AssignAccessDto { AccessCodes = dto.AccessCodes ?? new List<string>() },
+                currentUserId);
             if (!assignResult.IsSuccess)
             {
                 return Result<RoleDto>.Failure(assignResult.ErrorMessage ?? ResultMessages.FailedToCreateRole, assignResult.StatusCode);
@@ -132,7 +135,7 @@ namespace TaskTrackingSystem.WebApi.Features.Role
             return Result.Success(200);
         }
 
-        public async Task<Result> SoftDeleteRoleAsync(long id)
+        public async Task<Result> SoftDeleteRoleAsync(long id, long? currentUserId = null)
         {
             var role = await _db.Roles.FirstOrDefaultAsync(r => r.Id == id && r.IsDeleted != true);
             if (role == null)
@@ -141,6 +144,8 @@ namespace TaskTrackingSystem.WebApi.Features.Role
             }
 
             role.IsDeleted = true;
+            role.UpdatedAt = DateTime.UtcNow;
+            role.UpdatedBy = currentUserId;
             _db.Roles.Update(role);
             await _db.SaveChangesAsync();
             await _auditLog.LogAsync("Delete", "Role", $"Deleted role '{role.Name}'");
@@ -173,7 +178,7 @@ namespace TaskTrackingSystem.WebApi.Features.Role
             return Result<List<string>>.Success(assignedCodes);
         }
 
-        public async Task<Result> AssignAccessToRoleAsync(long roleId, AssignAccessDto dto)
+        public async Task<Result> AssignAccessToRoleAsync(long roleId, AssignAccessDto dto, long? currentUserId = null)
         {
             var role = await _db.Roles.FirstOrDefaultAsync(r => r.Id == roleId && r.IsDeleted != true);
             if (role == null)
@@ -231,51 +236,103 @@ namespace TaskTrackingSystem.WebApi.Features.Role
                 .Distinct()
                 .ToList();
 
-            var existingRoleMenus = await _db.RoleMenus.Where(rm => rm.RoleId == role.Id).ToListAsync();
-            var existingRolePermissions = await _db.RolePermissions.Where(rp => rp.RoleId == role.Id).ToListAsync();
+            var now = DateTime.UtcNow;
+            var existingRoleMenus = await _db.RoleMenus
+                .Where(rm => rm.RoleId == role.Id)
+                .ToListAsync();
+            var existingRolePermissions = await _db.RolePermissions
+                .Where(rp => rp.RoleId == role.Id)
+                .ToListAsync();
 
-            if (existingRoleMenus.Any())
-            {
-                _db.RoleMenus.RemoveRange(existingRoleMenus);
-            }
+            var oldMenuIds = existingRoleMenus
+                .Where(rm => !rm.IsDeleted)
+                .Select(rm => rm.MenuId)
+                .ToHashSet();
+            var oldPermissionIds = existingRolePermissions
+                .Where(rp => !rp.IsDeleted)
+                .Select(rp => rp.PermissionId)
+                .ToHashSet();
+
+            var existingRoleMenusByMenuId = existingRoleMenus.ToDictionary(rm => rm.MenuId);
+            var existingRolePermissionsByPermissionId = existingRolePermissions.ToDictionary(rp => rp.PermissionId);
 
-            if (existingRolePermissions.Any())
+            foreach (var existingMenu in existingRoleMenus)
             {
-                _db.RolePermissions.RemoveRange(existingRolePermissions);
+                var shouldBeActive = menuIdsToPersist.Contains(existingMenu.MenuId);
+
+                if (shouldBeActive)
+                {
+                    if (existingMenu.IsDeleted)
+                    {
+                        existingMenu.IsDeleted = false;
+                        existingMenu.UpdatedAt = now;
+                        existingMenu.UpdatedById = currentUserId;
+                    }
+                }
+                else if (!existingMenu.IsDeleted)
+                {
+                    existingMenu.IsDeleted = true;
+                    existingMenu.UpdatedAt = now;
+                    existingMenu.UpdatedById = currentUserId;
+                }
             }
 
             foreach (var menuId in menuIdsToPersist)
             {
+                if (existingRoleMenusByMenuId.ContainsKey(menuId))
+                {
+                    continue;
+                }
+
                 _db.RoleMenus.Add(new RoleMenu
                 {
                     RoleId = role.Id,
                     MenuId = menuId,
                     IsDeleted = false,
-                    CreatedAt = DateTime.UtcNow
+                    CreatedAt = now,
+                    CreatedById = currentUserId
                 });
             }
 
+            foreach (var existingPermission in existingRolePermissions)
+            {
+                var shouldBeActive = permissionIdsToPersist.Contains(existingPermission.PermissionId);
+
+                if (shouldBeActive)
+                {
+                    if (existingPermission.IsDeleted)
+                    {
+                        existingPermission.IsDeleted = false;
+                        existingPermission.UpdatedAt = now;
+                        existingPermission.UpdatedById = currentUserId;
+                    }
+                }
+                else if (!existingPermission.IsDeleted)
+                {
+                    existingPermission.IsDeleted = true;
+                    existingPermission.UpdatedAt = now;
+                    existingPermission.UpdatedById = currentUserId;
+                }
+            }
+
             foreach (var permissionId in permissionIdsToPersist)
             {
+                if (existingRolePermissionsByPermissionId.ContainsKey(permissionId))
+                {
+                    continue;
+                }
+
                 _db.RolePermissions.Add(new RolePermission
                 {
                     RoleId = role.Id,
                     PermissionId = permissionId,
                     IsDeleted = false,
-                    CreatedAt = DateTime.UtcNow
+                    CreatedAt = now,
+                    CreatedById = currentUserId
                 });
             }
 
             // Build a human-readable diff of what changed
-            var oldMenuCodes = existingRoleMenus
-                .Where(rm => !rm.IsDeleted)
-                .Select(rm => rm.MenuId)
-                .ToHashSet();
-            var oldPermissionIds = existingRolePermissions
-                .Where(rp => !rp.IsDeleted)
-                .Select(rp => rp.PermissionId)
-                .ToHashSet();
-
             // Load all menu and permission names for diff display
             var allMenuNames = await _db.Menus
                 .Where(m => !m.IsDeleted)
@@ -292,12 +349,12 @@ namespace TaskTrackingSystem.WebApi.Features.Role
                 p => $"{p.MenuName} — {p.ActionName}");
 
             var addedMenuNames = menuIdsToPersist
-                .Except(oldMenuCodes)
+                .Except(oldMenuIds)
                 .Select(id => menuNameLookup.TryGetValue(id, out var n) ? n : id.ToString())
                 .OrderBy(n => n)
                 .ToList();
 
-            var removedMenuNames = oldMenuCodes
+            var removedMenuNames = oldMenuIds
                 .Except(menuIdsToPersist)
                 .Select(id => menuNameLookup.TryGetValue(id, out var n) ? n : id.ToString())
                 .OrderBy(n => n)

TaskTrackingSystem.WebApi/Features/Task/TaskController.cs

@@ -5,6 +5,7 @@ using TaskTrackingSystem.Shared;
 using TaskTrackingSystem.Shared.Models.Task;
 using TaskTrackingSystem.WebApi.Features.Task;
 using TaskTrackingSystem.WebApi.Infrastructure;
+using TaskTrackingSystem.Shared.Enums;
 
 namespace TaskTrackingSystem.WebApi.Features.Task
 {
@@ -86,7 +87,7 @@ namespace TaskTrackingSystem.WebApi.Features.Task
         }
 
         [HttpPatch("{id}/status")]
-        public async Task<IActionResult> UpdateTaskStatus(long id, [FromQuery] long statusId)
+        public async Task<IActionResult> UpdateTaskStatus(long id, [FromQuery] AppTaskStatus statusId)
         {
             var result = await _taskService.UpdateTaskStatusAsync(id, statusId, User.GetRoleName(), User.GetUserId());
             if (!result.IsSuccess)

TaskTrackingSystem.WebApi/Features/Task/TaskDetailsController.cs

@@ -21,10 +21,12 @@ namespace TaskTrackingSystem.WebApi.Features.Task
     public class TaskDetailsController : ControllerBase
     {
         private readonly AppDbContext _db;
+        private readonly TaskTrackingSystem.WebApi.Features.Notification.FirebaseNotificationService _notificationService;
 
-        public TaskDetailsController(AppDbContext db)
+        public TaskDetailsController(AppDbContext db, TaskTrackingSystem.WebApi.Features.Notification.FirebaseNotificationService notificationService)
         {
             _db = db;
+            _notificationService = notificationService;
         }
 
         // ─── COMMENTS ────────────────────────────────────────────────────────
@@ -96,6 +98,8 @@ namespace TaskTrackingSystem.WebApi.Features.Task
             _db.Comments.Add(comment);
             await _db.SaveChangesAsync();
 
+            await _notificationService.NotifyCommentAddedAsync(task, userId, $"{user.FirstName} {user.LastName}");
+
             var resultDto = new CommentDto
             {
                 Id = comment.Id,

TaskTrackingSystem.WebApi/Features/Task/TaskService.cs

@@ -6,18 +6,20 @@ using System.Threading.Tasks;
 using TaskTrackingSystem.Database;
 using TaskTrackingSystem.Database.AppDbContextModels;
 using TaskTrackingSystem.Shared.Models.Task;
-
 using TaskTrackingSystem.Shared;
+using TaskTrackingSystem.Shared.Enums;
 
 namespace TaskTrackingSystem.WebApi.Features.Task
 {
     public class TaskService
     {
         private readonly AppDbContext _db;
+        private readonly TaskTrackingSystem.WebApi.Features.Notification.FirebaseNotificationService _notificationService;
 
-        public TaskService(AppDbContext db)
+        public TaskService(AppDbContext db, TaskTrackingSystem.WebApi.Features.Notification.FirebaseNotificationService notificationService)
         {
             _db = db;
+            _notificationService = notificationService;
         }
 
         public async Task<IEnumerable<TaskDto>> GetAllTasksAsync(string roleName, long currentUserId)
@@ -107,8 +109,8 @@ namespace TaskTrackingSystem.WebApi.Features.Task
                 Title = dto.Title,
                 Description = dto.Description,
                 ProjectId = dto.ProjectId,
-                StatusId = dto.StatusId == 0 ? 1 : dto.StatusId,
-                PriorityId = dto.PriorityId == 0 ? 2 : dto.PriorityId,
+                StatusId = dto.StatusId == 0 ? AppTaskStatus.Todo : dto.StatusId,
+                PriorityId = dto.PriorityId == 0 ? TaskPriority.Medium : dto.PriorityId,
                 AssignedTo = dto.AssignedTo,
                 AssignedBy = dto.AssignedBy,
                 EstimatedHours = dto.EstimatedHours,
@@ -121,6 +123,11 @@ namespace TaskTrackingSystem.WebApi.Features.Task
             _db.Tasks.Add(task);
             await _db.SaveChangesAsync();
 
+            if (task.AssignedTo.HasValue)
+            {
+                await _notificationService.NotifyTaskAssignedAsync(task, currentUserId);
+            }
+
             var resultDto = new TaskDto
             {
                 Id = task.Id,
@@ -150,6 +157,8 @@ namespace TaskTrackingSystem.WebApi.Features.Task
             var task = await _db.Tasks.FirstOrDefaultAsync(t => t.Id == id && t.IsDeleted != true);
             if (task == null) return Result.Failure(ResultMessages.TaskNotFound(id), 404);
 
+            var previousStatusId = task.StatusId;
+
             if (dto.AssignedTo.HasValue && !await IsProjectMemberAsync(task.ProjectId, dto.AssignedTo.Value))
             {
                 return Result.Failure("Task assignee must belong to the selected project.", 400);
@@ -166,8 +175,26 @@ namespace TaskTrackingSystem.WebApi.Features.Task
             task.UpdatedAt = DateTime.UtcNow;
             task.UpdatedBy = currentUserId;
 
+            if (previousStatusId != dto.StatusId)
+            {
+                _db.TaskHistories.Add(new TaskHistory
+                {
+                    TaskId = task.Id,
+                    ModifiedById = currentUserId ?? task.UpdatedBy ?? task.CreatedBy ?? 0,
+                    OldStatusId = previousStatusId,
+                    NewStatusId = dto.StatusId,
+                    CreatedBy = currentUserId ?? task.CreatedBy ?? 0,
+                    CreatedAt = DateTime.UtcNow
+                });
+            }
+
             _db.Tasks.Update(task);
             await _db.SaveChangesAsync();
+
+            if (previousStatusId != dto.StatusId && currentUserId.HasValue)
+            {
+                await _notificationService.NotifyTaskStatusChangedAsync(task, currentUserId.Value, previousStatusId, dto.StatusId);
+            }
             return Result.Success(200);
         }
 
@@ -218,7 +245,7 @@ namespace TaskTrackingSystem.WebApi.Features.Task
             return Result<IEnumerable<TaskDto>>.Success(tasks);
         }
 
-        public async Task<Result> UpdateTaskStatusAsync(long id, long statusId, string roleName, long currentUserId)
+        public async Task<Result> UpdateTaskStatusAsync(long id, AppTaskStatus statusId, string roleName, long currentUserId)
         {
             var task = await _db.Tasks.FirstOrDefaultAsync(t => t.Id == id && t.IsDeleted != true);
             if (task == null)
@@ -226,13 +253,30 @@ namespace TaskTrackingSystem.WebApi.Features.Task
                 return Result.Failure(ResultMessages.TaskNotFound(id), 404);
             }
 
+            var previousStatusId = task.StatusId;
+
             task.StatusId = statusId;
             task.UpdatedAt = DateTime.UtcNow;
             task.UpdatedBy = currentUserId;
 
+            _db.TaskHistories.Add(new TaskHistory
+            {
+                TaskId = task.Id,
+                ModifiedById = currentUserId,
+                OldStatusId = previousStatusId,
+                NewStatusId = statusId,
+                CreatedBy = currentUserId,
+                CreatedAt = DateTime.UtcNow
+            });
+
             _db.Tasks.Update(task);
             await _db.SaveChangesAsync();
 
+            if (previousStatusId != statusId)
+            {
+                await _notificationService.NotifyTaskStatusChangedAsync(task, currentUserId, previousStatusId, statusId);
+            }
+
             return Result.Success(200);
         }
 

TaskTrackingSystem.WebApi/Features/UserDevice/UserDeviceService.cs

@@ -0,0 +1,66 @@
+using Microsoft.EntityFrameworkCore;
+using TaskTrackingSystem.Database.AppDbContextModels;
+using TaskTrackingSystem.Shared;
+using DbUserDevice = TaskTrackingSystem.Database.AppDbContextModels.UserDevice;
+
+namespace TaskTrackingSystem.WebApi.Features.UserDevice;
+
+public class UserDeviceService
+{
+    private readonly AppDbContext _db;
+
+    public UserDeviceService(AppDbContext db)
+    {
+        _db = db;
+    }
+
+    public async Task<Result> RegisterTokenAsync(long userId, string fcmToken)
+    {
+        var token = fcmToken.Trim();
+        if (string.IsNullOrWhiteSpace(token))
+        {
+            return Result.Failure("FCM token is required.", 400);
+        }
+
+        var existing = await _db.UserDevices.FirstOrDefaultAsync(x => x.FcmToken == token);
+        var now = DateTime.UtcNow;
+
+        if (existing == null)
+        {
+            _db.UserDevices.Add(new DbUserDevice
+            {
+                UserId = userId,
+                FcmToken = token,
+                CreatedAt = now,
+                UpdatedAt = now
+            });
+        }
+        else
+        {
+            existing.UserId = userId;
+            existing.UpdatedAt = now;
+        }
+
+        await _db.SaveChangesAsync();
+        return Result.Success();
+    }
+
+    public async Task<Result> RemoveTokenAsync(long userId, string fcmToken)
+    {
+        var token = fcmToken.Trim();
+        if (string.IsNullOrWhiteSpace(token))
+        {
+            return Result.Failure("FCM token is required.", 400);
+        }
+
+        var device = await _db.UserDevices.FirstOrDefaultAsync(x => x.UserId == userId && x.FcmToken == token);
+        if (device == null)
+        {
+            return Result.Success(204);
+        }
+
+        _db.UserDevices.Remove(device);
+        await _db.SaveChangesAsync();
+        return Result.Success(204);
+    }
+}

TaskTrackingSystem.WebApi/Features/UserDevice/UserDevicesController.cs

@@ -0,0 +1,46 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using TaskTrackingSystem.Shared;
+using TaskTrackingSystem.Shared.Models.Notification;
+using TaskTrackingSystem.WebApi.Infrastructure;
+
+namespace TaskTrackingSystem.WebApi.Features.UserDevice;
+
+[ApiController]
+[Authorize]
+[Route("api/[controller]")]
+public class UserDevicesController : ControllerBase
+{
+    private readonly UserDeviceService _userDeviceService;
+
+    public UserDevicesController(UserDeviceService userDeviceService)
+    {
+        _userDeviceService = userDeviceService;
+    }
+
+    [HttpPost("register")]
+    public async Task<ActionResult<Result>> Register([FromBody] RegisterDeviceTokenDto dto)
+    {
+        var userId = User.GetUserId();
+        if (userId <= 0)
+        {
+            return Unauthorized(Result.Failure("User is not authenticated.", 401));
+        }
+
+        var result = await _userDeviceService.RegisterTokenAsync(userId, dto.FcmToken);
+        return StatusCode(result.StatusCode, result);
+    }
+
+    [HttpPost("unregister")]
+    public async Task<ActionResult<Result>> Unregister([FromBody] RegisterDeviceTokenDto dto)
+    {
+        var userId = User.GetUserId();
+        if (userId <= 0)
+        {
+            return Unauthorized(Result.Failure("User is not authenticated.", 401));
+        }
+
+        var result = await _userDeviceService.RemoveTokenAsync(userId, dto.FcmToken);
+        return StatusCode(result.StatusCode, result);
+    }
+}

TaskTrackingSystem.WebApi/Program.cs

@@ -11,6 +11,7 @@ var builder = WebApplication.CreateBuilder(args);
 // Add services to the container.
 
 builder.Services.AddControllers();
+builder.Services.AddHttpClient();
 
 // CORS policy for WebApp
 builder.Services.AddCors(options =>
@@ -32,6 +33,9 @@ builder.Services.AddScoped<TaskTrackingSystem.WebApi.Features.Task.TaskService>(
 builder.Services.AddScoped<TaskTrackingSystem.WebApi.Features.Dashboard.DashboardService>();
 builder.Services.AddScoped<TaskTrackingSystem.WebApi.Features.Report.ReportService>();
 builder.Services.AddScoped<TaskTrackingSystem.WebApi.Features.Menu.MenuService>();
+builder.Services.AddScoped<TaskTrackingSystem.WebApi.Features.UserDevice.UserDeviceService>();
+builder.Services.AddScoped<TaskTrackingSystem.WebApi.Features.Notification.FirebaseNotificationService>();
+builder.Services.AddScoped<TaskTrackingSystem.WebApi.Features.Notification.NotificationService>();
 builder.Services.AddScoped<TaskTrackingSystem.WebApi.Infrastructure.PermissionAuthorizationService>();
 builder.Services.AddScoped<IPasswordHasher<TaskTrackingSystem.Database.AppDbContextModels.User>, PasswordHasher<TaskTrackingSystem.Database.AppDbContextModels.User>>();
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
@@ -120,5 +124,19 @@ static async System.Threading.Tasks.Task EnsureSeedDataAsync(WebApplication app)
         backlogMenu.UpdatedAt = DateTime.UtcNow;
     }
 
+    // Soft-delete existing tasks that belong to deleted projects
+    var orphanedTasks = await db.Tasks
+        .Where(t => t.IsDeleted != true && t.Project.IsDeleted == true)
+        .ToListAsync();
+    foreach (var task in orphanedTasks)
+    {
+        task.IsDeleted = true;
+        task.UpdatedAt = DateTime.UtcNow;
+    }
+    if (orphanedTasks.Any())
+    {
+        db.Tasks.UpdateRange(orphanedTasks);
+    }
+
     await db.SaveChangesAsync();
 }

TaskTrackingSystem.WebApi/TaskTrackingSystem.WebApi.csproj

@@ -21,6 +21,12 @@
     <ProjectReference Include="..\TaskTrackingSystem.Shared\TaskTrackingSystem.Shared.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="Firebase\ttsfirebasekey.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
   <ItemGroup>
     <Folder Include="Features\Dashboard\" />
     <Folder Include="Features\Report\" />

TaskTrackingSystem.WebApi/appsettings.Development.json

@@ -4,5 +4,8 @@
       "Default": "Information",
       "Microsoft.AspNetCore": "Warning"
     }
+  },
+  "Firebase": {
+    "ServiceAccountPath": "Firebase/ttsfirebasekey.json"
   }
 }

TaskTrackingSystem.WebApi/appsettings.json

@@ -14,6 +14,9 @@
   "PasswordReset": {
     "RecoveryCode": "TASKIFY-RESET-2026"
   },
+  "Firebase": {
+    "ServiceAccountPath": "Firebase/ttsfirebasekey.json"
+  },
   "ConnectionStrings": {
     "DefaultConnection": "Server=.;Database=TTS;Trusted_Connection=True;TrustServerCertificate=True;Connect Timeout=5;"
   }

TaskTrackingSystem.WebApp/Components/App.razor

@@ -12,33 +12,212 @@
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/flatpickr/dist/flatpickr.min.css">
     <script src="https://cdn.jsdelivr.net/npm/flatpickr"></script>
     <script src="https://cdn.tailwindcss.com"></script>
+    <script src="firebase-app-compat.js"></script>
+    <script src="firebase-messaging-compat.js"></script>
+    <script src="firebase-config.js"></script>
+    <script src="firebase-messaging.js"></script>
     <script>
+        const brandDark = "#10002B";
+        const brandDarkAlt = "#240046";
+        const brandPrimary = "#5A189A";
+        const brandAccent = "#7B2CBF";
+        const brandLight = "#E0AAFF";
+        const brandMuted = "#9D4EDD";
+        
+        const semanticRedBg = "#FFE4E6";
+        const semanticRedText = "#991B1B";
+        
+        const semanticGreenBg = "#D1FAE5";
+        const semanticGreenText = "#065F46";
+        
+        const semanticPurpleBg = "#E0AAFF";
+        const semanticPurpleText = "#3C096C";
+        
+        const neutralBg = "#F8F9FA";
+        const neutralBorder = "#E5E7EB";
+        const neutralMuted = "#6B7280";
+        const neutralDark = "#10002B";
+
+        const customGray = {
+            50: neutralBg,
+            100: "#F3F4F6",
+            200: neutralBorder,
+            300: "#D1D5DB",
+            400: "#9CA3AF",
+            500: neutralMuted,
+            600: "#4B5563",
+            700: "#374151",
+            800: "#1F2937",
+            900: neutralDark,
+            950: neutralDark
+        };
+
         tailwind.config = {
             darkMode: 'class',
             theme: {
-                extend: {
-                    colors: {
-                        background: "#F4F3FA",          
-                        foreground: "#1E1B4B",          
-                        card: "#FFFFFF",                
-                        "card-foreground": "#1E1B4B",   
-                        popover: "#FFFFFF",
-                        "popover-foreground": "#1E1B4B",
+                colors: {
+                    transparent: 'transparent',
+                    current: 'currentColor',
+                    white: '#ffffff',
+                    black: '#000000',
+                    
+                    slate: customGray,
+                    gray: customGray,
+                    zinc: customGray,
+                    neutral: customGray,
+                    stone: customGray,
+
+                    red: {
+                        50: semanticRedBg,
+                        100: semanticRedBg,
+                        200: "#FECDD3",
+                        300: "#FDA4AF",
+                        400: "#FB7185",
+                        500: semanticRedText,
+                        600: semanticRedText,
+                        700: semanticRedText,
+                        800: semanticRedText,
+                        900: semanticRedText
+                    },
+                    rose: {
+                        50: semanticRedBg,
+                        100: semanticRedBg,
+                        200: "#FECDD3",
+                        300: "#FDA4AF",
+                        400: "#FB7185",
+                        500: semanticRedText,
+                        600: semanticRedText,
+                        700: semanticRedText,
+                        800: semanticRedText,
+                        900: semanticRedText
+                    },
+                    green: {
+                        50: semanticGreenBg,
+                        100: semanticGreenBg,
+                        200: "#A7F3D0",
+                        300: "#6EE7B7",
+                        400: "#34D399",
+                        500: semanticGreenText,
+                        600: semanticGreenText,
+                        700: semanticGreenText,
+                        800: semanticGreenText,
+                        900: semanticGreenText
+                    },
+                    emerald: {
+                        50: semanticGreenBg,
+                        100: semanticGreenBg,
+                        200: "#A7F3D0",
+                        300: "#6EE7B7",
+                        400: "#34D399",
+                        500: semanticGreenText,
+                        600: semanticGreenText,
+                        700: semanticGreenText,
+                        800: semanticGreenText,
+                        900: semanticGreenText
+                    },
+                    blue: {
+                        50: semanticPurpleBg,
+                        100: semanticPurpleBg,
+                        200: "#C77DFF",
+                        300: "#9D4EDD",
+                        400: "#7B2CBF",
+                        500: semanticPurpleText,
+                        600: semanticPurpleText,
+                        700: semanticPurpleText,
+                        800: semanticPurpleText,
+                        900: semanticPurpleText
+                    },
+                    amber: {
+                        50: semanticPurpleBg,
+                        100: semanticPurpleBg,
+                        200: "#C77DFF",
+                        300: "#9D4EDD",
+                        400: "#7B2CBF",
+                        500: semanticPurpleText,
+                        600: semanticPurpleText,
+                        700: semanticPurpleText,
+                        800: semanticPurpleText,
+                        900: semanticPurpleText
+                    },
+                    yellow: {
+                        50: semanticPurpleBg,
+                        100: semanticPurpleBg,
+                        200: "#C77DFF",
+                        300: "#9D4EDD",
+                        400: "#7B2CBF",
+                        500: semanticPurpleText,
+                        600: semanticPurpleText,
+                        700: semanticPurpleText,
+                        800: semanticPurpleText,
+                        900: semanticPurpleText
+                    },
+                    violet: {
+                        50: brandLight,
+                        100: "#E8E8FF",
+                        200: brandMuted,
+                        300: brandMuted,
+                        400: brandAccent,
+                        500: brandPrimary,
+                        600: brandPrimary,
+                        700: brandDarkAlt,
+                        800: brandDark,
+                        900: brandDark,
+                        950: brandDark
+                    },
+                    purple: {
+                        50: brandLight,
+                        100: "#E8E8FF",
+                        200: brandMuted,
+                        300: brandMuted,
+                        400: brandAccent,
+                        500: brandPrimary,
+                        600: brandPrimary,
+                        700: brandDarkAlt,
+                        800: brandDark,
+                        900: brandDark,
+                        950: brandDark
+                    },
+                    indigo: {
+                        50: brandLight,
+                        100: "#E8E8FF",
+                        200: brandMuted,
+                        300: brandMuted,
+                        400: brandAccent,
+                        500: brandPrimary,
+                        600: brandPrimary,
+                        700: brandDarkAlt,
+                        800: brandDark,
+                        900: brandDark,
+                        950: brandDark
+                    },
+
+                    chart: {
+                        purple: "#5A189A",
+                        teal: "#06B6D4",
+                        green: "#10B981",
+                        neutral: "#E5E7EB"
+                    },
+
+                    background: neutralBg,          
+                    foreground: neutralDark,          
+                    card: "#FFFFFF",                
+                    "card-foreground": neutralDark,   
+                    popover: "#FFFFFF",
+                    "popover-foreground": neutralDark,
 
-                        primary: "#7C3AED",              
-                        "primary-foreground": "#FFFFFF",
+                    primary: brandPrimary,              
+                    "primary-foreground": "#FFFFFF",
 
-                        secondary: "#EEF2F6",            
-                        "secondary-foreground": "#1E1B4B",
+                    secondary: brandLight,            
+                    "secondary-foreground": neutralDark,
 
-                        muted: "#F3F4F6",                
-                        "muted-foreground": "#6B7280",
+                    muted: "#F3F4F6",                
+                    "muted-foreground": neutralMuted,
 
-                        accent: "#8B5CF6",               
-                        "accent-foreground": "#FFFFFF",
+                    accent: brandAccent,               
+                    "accent-foreground": "#FFFFFF",
 
-                        border: "#E5E7EB",               
-                    }
+                    border: neutralBorder,
                 }
             }
         }

TaskTrackingSystem.WebApp/Components/Layout/MainLayout.razor

@@ -2,29 +2,29 @@
 @implements IDisposable
 @using System.Security.Claims
 
-<div class="flex h-screen bg-[#F4F3FA] font-sans text-slate-800 antialiased overflow-hidden">
-    <aside class="flex w-64 flex-col border-r border-slate-100 bg-white shrink-0 overflow-hidden">
+<div class="flex h-screen bg-background font-sans text-slate-800 antialiased overflow-hidden">
+    <aside class="flex w-64 flex-col border-r border-slate-900 bg-[#10002B] text-white shrink-0 overflow-hidden">
         <div class="flex h-20 items-center px-6">
-            <span class="flex h-9 w-9 items-center justify-center rounded-xl bg-violet-100 text-violet-600">
+            <span class="flex h-9 w-9 items-center justify-center rounded-xl bg-white/10 text-white">
                 <i data-lucide="flame" class="h-5 w-5 fill-current"></i>
             </span>
-            <span class="ml-3 font-bold text-xl tracking-tight text-slate-800">Taskify</span>
+            <span class="ml-3 font-bold text-xl tracking-tight text-white">Taskify</span>
         </div>
 
         <NavMenu @rendermode="new InteractiveServerRenderMode(prerender: false)" />
 
-        <div class="border-t border-slate-100 p-4 shrink-0">
+        <div class="border-t border-slate-800 p-4 shrink-0">
             <AuthorizeView>
                 <Authorized>
-                    <div class="flex items-center rounded-xl p-2 hover:bg-slate-50 transition-all">
+                    <div class="flex items-center rounded-xl p-2 hover:bg-white/10 transition-all">
                         <span class="flex h-10 w-10 items-center justify-center rounded-full bg-violet-600 text-white font-semibold text-sm shrink-0">
                             @(context.User.Identity?.Name?.Length > 0 ? context.User.Identity.Name[0].ToString().ToUpper() : "U")
                         </span>
                         <div class="ml-3 overflow-hidden flex flex-col">
-                            <span class="text-sm font-semibold truncate max-w-[130px]" style="color: var(--text-primary);">@context.User.Identity?.Name</span>
+                            <span class="text-sm font-semibold truncate max-w-[130px] text-white">@context.User.Identity?.Name</span>
                             <form id="logout-form" method="post" action="/account/logout" class="mt-0.5">
                                 <AntiforgeryToken />
-                                <button type="button" onclick="document.getElementById('logout-confirm-dialog').style.display='flex';" class="text-xs hover:opacity-80 font-semibold text-left flex items-center gap-1 transition-all" style="color: var(--brand-accent);">
+                                <button type="button" onclick="document.getElementById('logout-confirm-dialog').style.display='flex';" class="text-xs hover:opacity-80 font-semibold text-left flex items-center gap-1 transition-all text-[#C77DFF]">
                                     <i data-lucide="log-out" class="h-3 w-3"></i>
                                     Sign Out
                                 </button>
@@ -65,10 +65,12 @@
         <header class="flex h-16 items-center justify-between border-b border-slate-200 bg-white px-8">
             <h1 class="text-lg font-semibold text-slate-900">Workspace</h1>
             <div class="flex items-center space-x-4">
-                <button class="relative rounded-full p-1.5 text-slate-400 hover:bg-slate-50 hover:text-blue-600 transition-all">
-                    <i data-lucide="bell" class="h-5 w-5"></i>
-                    <span class="absolute right-1.5 top-1.5 h-2 w-2 rounded-full bg-blue-500"></span>
-                </button>
+                <AuthorizeView>
+                    <Authorized>
+                        <FirebaseTokenSync />
+                    </Authorized>
+                </AuthorizeView>
+                <NotificationBell />
             </div>
         </header>
 

TaskTrackingSystem.WebApp/Components/Layout/MainLayout.razor.css

@@ -10,12 +10,12 @@ main {
 }
 
 .sidebar {
-    background-color: #ffffff;
+    background-color: #10002B;
 }
 
 .top-row {
     background-color: #ffffff;
-    border-bottom: 1px solid #e2e8f0;
+    border-bottom: 1px solid #E5E7EB;
     justify-content: flex-end;
     height: 3.5rem;
     display: flex;
@@ -27,14 +27,13 @@ main {
     white-space: nowrap;
     margin-left: 1.5rem;
     text-decoration: none;
-    color: #e6e094;
-    /* Soft yellow text */
+    color: #6B7280;
 }
 
 .top-row ::deep a:hover,
 .top-row ::deep .btn-link:hover {
     text-decoration: underline;
-    color: white;
+    color: #10002B;
 }
 
 @media (min-width: 641px) {
@@ -51,8 +50,8 @@ main {
 }
 
 #blazor-error-ui {
-    background: #e6e094;
-    color: #2d2d2d;
+    background: #FFE4E6;
+    color: #991B1B;
     bottom: 0;
     position: fixed;
     width: 100%;

TaskTrackingSystem.WebApp/Components/Layout/NavMenu.razor.css

@@ -6,31 +6,36 @@
     padding: 0.625rem 1rem;
     font-size: 0.875rem;
     font-weight: 500;
-    color: #4B5563; /* text-slate-600 */
+    color: #C77DFF; /* Soft muted lavender for inactive states */
     transition: all 0.2s ease;
     border-left: 3px solid transparent;
 }
 
 ::deep a.nav-link-item:hover {
-    background-color: #F9FAFB; /* bg-slate-50 */
-    color: #111827; /* text-slate-900 */
+    background-color: rgba(255, 255, 255, 0.08); /* crisp highlight on hover */
+    color: #FFFFFF;
 }
 
 ::deep a.nav-link-item.active {
-    background-color: #F5F3FF !important; /* bg-violet-50 */
-    color: #7C3AED !important; /* text-violet-600 */
-    border-left: 3px solid #7C3AED !important;
+    background-color: rgba(255, 255, 255, 0.15) !important;
+    color: #FFFFFF !important;
+    border-left: 3px solid #E0AAFF !important;
     font-weight: 600;
 }
 
 ::deep a.nav-link-item.active i {
-    color: #7C3AED !important;
+    color: #FFFFFF !important;
 }
 
 ::deep a.nav-link-item i {
+    color: #C77DFF;
     transition: color 0.2s ease;
 }
 
+::deep a.nav-link-item:hover i {
+    color: #FFFFFF;
+}
+
 /* Dropdown toggle button (parent item) */
 ::deep button.nav-dropdown-toggle {
     display: flex;
@@ -40,7 +45,7 @@
     padding: 0.625rem 1rem;
     font-size: 0.875rem;
     font-weight: 500;
-    color: #4B5563;
+    color: #C77DFF;
     background: none;
     border: none;
     border-left: 3px solid transparent;
@@ -49,15 +54,24 @@
 }
 
 ::deep button.nav-dropdown-toggle:hover {
-    background-color: #F9FAFB;
-    color: #111827;
+    background-color: rgba(255, 255, 255, 0.08);
+    color: #FFFFFF;
 }
 
 ::deep button.nav-dropdown-toggle.expanded {
-    color: #111827;
+    color: #FFFFFF;
     font-weight: 600;
 }
 
+::deep button.nav-dropdown-toggle:hover i,
+::deep button.nav-dropdown-toggle.expanded i {
+    color: #FFFFFF;
+}
+
+::deep button.nav-dropdown-toggle i {
+    color: #C77DFF;
+}
+
 /* Chevron rotation on expand */
 ::deep button.nav-dropdown-toggle .nav-chevron {
     transition: transform 0.25s ease;
@@ -71,7 +85,7 @@
 ::deep .nav-dropdown-children {
     margin-left: 0.75rem;
     padding-left: 0.75rem;
-    border-left: 1.5px solid #E2E8F0; /* slate-200 */
+    border-left: 1.5px solid rgba(255, 255, 255, 0.15);
     margin-top: 0.125rem;
     margin-bottom: 0.25rem;
 }

TaskTrackingSystem.WebApp/Components/Pages/Backlog.razor

@@ -47,17 +47,17 @@
 
                     <div class="grid grid-cols-2 gap-2">
                         <select @bind="filterStatusId" class="rounded-lg border border-slate-200 px-2 py-1.5 text-[11px] text-slate-700 bg-white focus:outline-none focus:ring-1 focus:ring-violet-600 transition-all">
-                            <option value="0">All Status</option>
-                            <option value="1">To Do</option>
-                            <option value="2">In Progress</option>
-                            <option value="3">Done</option>
+                            <option value="">All Status</option>
+                            <option value="@AppTaskStatus.Todo">To Do</option>
+                            <option value="@AppTaskStatus.InProgress">In Progress</option>
+                            <option value="@AppTaskStatus.Done">Done</option>
                         </select>
 
                         <select @bind="filterPriorityId" class="rounded-lg border border-slate-200 px-2 py-1.5 text-[11px] text-slate-700 bg-white focus:outline-none focus:ring-1 focus:ring-violet-600 transition-all">
-                            <option value="0">All Priority</option>
-                            <option value="1">Low</option>
-                            <option value="2">Medium</option>
-                            <option value="3">High</option>
+                            <option value="">All Priority</option>
+                            <option value="@TaskPriority.Low">Low</option>
+                            <option value="@TaskPriority.Medium">Medium</option>
+                            <option value="@TaskPriority.High">High</option>
                         </select>
                     </div>
 
@@ -98,7 +98,7 @@
                                                         @GetPriorityLabel(task.PriorityId)
                                                     </span>
                                                 </div>
-                                                <h4 class="text-xs font-bold text-slate-800 line-clamp-2 @(task.StatusId == 3 ? "line-through text-slate-400" : "")">
+                                                <h4 class="text-xs font-bold text-slate-800 line-clamp-2 @(task.StatusId == AppTaskStatus.Done ? "line-through text-slate-400" : "")">
                                                     @task.Title
                                                 </h4>
                                                 <div class="flex items-center justify-between gap-2 mt-0.5">
@@ -169,8 +169,8 @@
     private string searchInput = "";
     private string searchQuery => searchInput.Trim().ToLower();
     private long filterProjectId = 0;
-    private long filterStatusId = 0;
-    private long filterPriorityId = 0;
+    private AppTaskStatus? filterStatusId = null;
+    private TaskPriority? filterPriorityId = null;
 
     protected override async Task OnInitializedAsync()
     {
@@ -260,47 +260,47 @@
             {
                 result = result.Where(t => t.ProjectId == filterProjectId);
             }
-            if (filterStatusId > 0)
+            if (filterStatusId.HasValue)
             {
-                result = result.Where(t => t.StatusId == filterStatusId);
+                result = result.Where(t => t.StatusId == filterStatusId.Value);
             }
-            if (filterPriorityId > 0)
+            if (filterPriorityId.HasValue)
             {
-                result = result.Where(t => t.PriorityId == filterPriorityId);
+                result = result.Where(t => t.PriorityId == filterPriorityId.Value);
             }
             return result;
         }
     }
 
-    private string GetStatusLabel(long statusId) => statusId switch
+    private string GetStatusLabel(AppTaskStatus statusId) => statusId switch
     {
-        1 => "To Do",
-        2 => "In Progress",
-        3 => "Done",
+        AppTaskStatus.Todo => "To Do",
+        AppTaskStatus.InProgress => "In Progress",
+        AppTaskStatus.Done => "Done",
         _ => "Unknown"
     };
 
-    private string GetStatusBadge(long statusId) => statusId switch
+    private string GetStatusBadge(AppTaskStatus statusId) => statusId switch
     {
-        1 => "bg-slate-100 text-slate-800 border border-slate-200",
-        2 => "bg-blue-50 text-blue-700 border border-blue-100",
-        3 => "bg-emerald-50 text-emerald-700 border border-emerald-100",
+        AppTaskStatus.Todo => "bg-slate-100 text-slate-800 border border-slate-200",
+        AppTaskStatus.InProgress => "bg-blue-50 text-blue-700 border border-blue-100",
+        AppTaskStatus.Done => "bg-emerald-50 text-emerald-700 border border-emerald-100",
         _ => "bg-slate-50 text-slate-600"
     };
 
-    private string GetPriorityLabel(long priorityId) => priorityId switch
+    private string GetPriorityLabel(TaskPriority priorityId) => priorityId switch
     {
-        1 => "Low",
-        2 => "Medium",
-        3 => "High",
+        TaskPriority.Low => "Low",
+        TaskPriority.Medium => "Medium",
+        TaskPriority.High => "High",
         _ => "Unknown"
     };
 
-    private string GetPriorityBadge(long priorityId) => priorityId switch
+    private string GetPriorityBadge(TaskPriority priorityId) => priorityId switch
     {
-        1 => "bg-slate-100 text-slate-600",
-        2 => "bg-amber-50 text-amber-700 border border-amber-100",
-        3 => "bg-rose-50 text-rose-700 border border-rose-100",
+        TaskPriority.Low => "bg-slate-100 text-slate-600",
+        TaskPriority.Medium => "bg-amber-50 text-amber-700 border border-amber-100",
+        TaskPriority.High => "bg-rose-50 text-rose-700 border border-rose-100",
         _ => "bg-slate-50 text-slate-600"
     };
 }

TaskTrackingSystem.WebApp/Components/Pages/Home.razor

@@ -112,7 +112,7 @@ else
                                                 <span class="font-semibold text-slate-700">@progress%</span>
                                             </div>
                                             <div class="h-2 rounded-full bg-slate-100 overflow-hidden">
-                                                <div class="h-full rounded-full bg-emerald-500 transition-all" style="width: @(progress)%"></div>
+                                                <div class="h-full rounded-full bg-violet-600 transition-all" style="width: @(progress)%"></div>
                                             </div>
                                         </div>
                                         <span class="inline-block mt-3 rounded-full px-2 py-0.5 text-[10px] font-semibold @(daysLeft < 0 ? "bg-rose-50 text-rose-600" : daysLeft < 3 ? "bg-amber-50 text-amber-600" : "bg-emerald-50 text-emerald-600")">
@@ -145,7 +145,7 @@ else
                                         <span class="text-slate-500">@pp.CompletedTasksCount / @pp.TotalTasksCount</span>
                                     </div>
                                     <div class="h-2.5 rounded-full bg-slate-100 overflow-hidden">
-                                        <div class="h-full rounded-full bg-emerald-500 transition-all" style="width: @pp.CompletionPercentage%"></div>
+                                        <div class="h-full rounded-full bg-violet-600 transition-all" style="width: @pp.CompletionPercentage%"></div>
                                     </div>
                                 </div>
                             }
@@ -167,7 +167,7 @@ else
                         {
                             <div class="flex flex-col items-center space-y-2 flex-1">
                                 <div class="w-full max-w-[24px] rounded-t-lg bg-slate-100 h-32 flex items-end">
-                                    <div class="w-full rounded-t-lg bg-emerald-500 transition-all duration-700" style="height: @(chartBar.Height)%"></div>
+                                    <div class="w-full rounded-t-lg bg-violet-600 transition-all duration-700" style="height: @(chartBar.Height)%"></div>
                                 </div>
                                 <span class="text-[10px] font-medium text-slate-400 uppercase">@chartBar.Day</span>
                             </div>
@@ -224,9 +224,9 @@ else
                             @foreach (var task in ChecklistTasks)
                             {
                                 <div class="flex items-start gap-3 p-2 rounded-lg hover:bg-slate-50 transition-colors">
-                                    <input type="checkbox" checked="@(task.StatusId == 3)" @onchange="() => ToggleTaskStatus(task)" disabled="@(!canUpdateTask)" class="h-4 w-4 rounded border-slate-300 text-emerald-600 accent-emerald-600 mt-0.5 disabled:opacity-50 disabled:cursor-not-allowed" />
+                                    <input type="checkbox" checked="@(task.StatusId == AppTaskStatus.Done)" @onchange="() => ToggleTaskStatus(task)" disabled="@(!canUpdateTask)" class="h-4 w-4 rounded border-slate-300 text-emerald-600 accent-emerald-600 mt-0.5 disabled:opacity-50 disabled:cursor-not-allowed" />
                                     <div class="min-w-0 flex-1">
-                                        <p class="text-xs font-semibold text-slate-800 truncate @(task.StatusId == 3 ? "line-through text-slate-400" : "")">@task.Title</p>
+                                        <p class="text-xs font-semibold text-slate-800 truncate @(task.StatusId == AppTaskStatus.Done ? "line-through text-slate-400" : "")">@task.Title</p>
                                         <p class="text-[10px] text-slate-400">Due @DisplayFormats.Date(task.DueDate)</p>
                                     </div>
                                 </div>
@@ -336,25 +336,25 @@ else
         await JS.InvokeVoidAsync("initIcons");
     }
 
-    private IEnumerable<TaskDto> ActiveTasks => taskList.Where(t => t.StatusId == 2).Take(3);
-    private IEnumerable<TaskDto> ChecklistTasks => taskList.Where(t => t.StatusId != 3).Take(4);
-    private int ChecklistCompletedCount => taskList.Count(t => t.StatusId == 3);
+    private IEnumerable<TaskDto> ActiveTasks => taskList.Where(t => t.StatusId == AppTaskStatus.InProgress).Take(3);
+    private IEnumerable<TaskDto> ChecklistTasks => taskList.Where(t => t.StatusId != AppTaskStatus.Done).Take(4);
+    private int ChecklistCompletedCount => taskList.Count(t => t.StatusId == AppTaskStatus.Done);
 
     private int TotalTasksCount => taskStatuses.Sum(s => s.TaskCount);
-    private int CompletedTasksCount => taskStatuses.FirstOrDefault(s => s.StatusId == 3)?.TaskCount ?? 0;
+    private int CompletedTasksCount => taskStatuses.FirstOrDefault(s => s.StatusId == (int)AppTaskStatus.Done)?.TaskCount ?? 0;
     private int TaskCompletionRate => TotalTasksCount > 0 ? (int)((double)CompletedTasksCount / TotalTasksCount * 100) : 0;
-    private int OverdueTasksCount => taskList.Count(t => t.DueDate.Date < DateTime.Today && t.StatusId != 3);
+    private int OverdueTasksCount => taskList.Count(t => t.DueDate.Date < DateTime.Today && t.StatusId != AppTaskStatus.Done);
 
     private IEnumerable<UserDto> GetTeamMembers()
     {
         return usersList.Where(u => !u.Username.Equals(currentUserName, StringComparison.OrdinalIgnoreCase)).Take(3);
     }
 
-    private int GetTaskProgress(long statusId) => statusId switch
+    private int GetTaskProgress(AppTaskStatus statusId) => statusId switch
     {
-        1 => 10,
-        2 => 50,
-        3 => 100,
+        AppTaskStatus.Todo => 10,
+        AppTaskStatus.InProgress => 50,
+        AppTaskStatus.Done => 100,
         _ => 0
     };
 
@@ -367,8 +367,8 @@ else
         for (int i = 0; i < 7; i++)
         {
             var day = startOfWeek.AddDays(i);
-            var completedCount = taskList.Count(t => t.StatusId == 3 && t.DueDate.Date == day);
-            var maxCount = Math.Max(taskList.Count(t => t.StatusId == 3), 1);
+            var completedCount = taskList.Count(t => t.StatusId == AppTaskStatus.Done && t.DueDate.Date == day);
+            var maxCount = Math.Max(taskList.Count(t => t.StatusId == AppTaskStatus.Done), 1);
             var height = (int)Math.Max(10, (double)completedCount / maxCount * 100);
             bars.Add(new ChartBar(day.ToString("ddd")[..1], height));
         }
@@ -383,14 +383,14 @@ else
             return;
         }
 
-        var newStatusId = task.StatusId == 3 ? 1 : 3;
+        var newStatus = task.StatusId == AppTaskStatus.Done ? AppTaskStatus.Todo : AppTaskStatus.Done;
         var client = ApiClient.CreateClient();
         try
         {
-            var response = await client.PatchAsync($"Task/{task.Id}/status?statusId={newStatusId}", null);
+            var response = await client.PatchAsync($"Task/{task.Id}/status?statusId={(int)newStatus}", null);
             if (response.IsSuccessStatusCode)
             {
-                task.StatusId = newStatusId;
+                task.StatusId = newStatus;
                 await LoadDashboardData();
             }
         }

TaskTrackingSystem.WebApp/Components/Pages/KanbanBoard.razor

@@ -24,7 +24,7 @@
             }
             <div>
                 <h2 class="text-3xl font-bold tracking-tight text-slate-900">Kanban Board</h2>
-                <p class="text-slate-500 mt-1">@(ProjectId > 0 ? $"Project #{ProjectId} — " : "Global View — ")Drag tasks between columns.</p>
+                <p class="text-slate-500 mt-1">@(ProjectId > 0 ? $"Project #{ProjectId} — " : "Global View — ")Drag tasks between columns.</p>
             </div>
         </div>
         @if (canCreateTask)
@@ -125,9 +125,9 @@
                     <div>
                         <label class="block text-sm font-medium text-slate-700 mb-1.5">Priority</label>
                         <select @bind="taskPriorityId" class="w-full rounded-lg border border-slate-200 px-3 py-2 text-sm text-slate-900 focus:outline-none focus:ring-2 focus:ring-slate-900 focus:border-transparent transition-all">
-                            <option value="1">Low</option>
-                            <option value="2">Medium</option>
-                            <option value="3">High</option>
+                            <option value="@TaskPriority.Low">Low</option>
+                            <option value="@TaskPriority.Medium">Medium</option>
+                            <option value="@TaskPriority.High">High</option>
                         </select>
                     </div>
                     <div>
@@ -194,14 +194,14 @@
     // Task form
     private string taskTitle = "";
     private string? taskDescription;
-    private long taskPriorityId = 2;
+    private TaskPriority taskPriorityId = TaskPriority.Medium;
     private DateTime taskDueDate = DateTime.Today.AddDays(7);
 
     private List<KanbanColumn> columns = new()
     {
-        new(1, "To Do", "bg-slate-400"),
-        new(2, "In Progress", "bg-blue-500"),
-        new(3, "Done", "bg-emerald-500")
+        new(AppTaskStatus.Todo, "To Do", "bg-slate-400"),
+        new(AppTaskStatus.InProgress, "In Progress", "bg-blue-500"),
+        new(AppTaskStatus.Done, "Done", "bg-emerald-500")
     };
 
     private TaskDto? draggedTask;
@@ -216,7 +216,7 @@
         // Allow dropping
     }
 
-    private async Task HandleDrop(long newStatusId)
+    private async Task HandleDrop(AppTaskStatus newStatusId)
     {
         if (draggedTask != null && draggedTask.StatusId != newStatusId)
         {
@@ -282,7 +282,7 @@
         }
     }
 
-    private async Task MoveTask(long taskId, long newStatusId)
+    private async Task MoveTask(long taskId, AppTaskStatus newStatusId)
     {
         if (!canUpdateTask)
         {
@@ -312,7 +312,7 @@
     {
         taskTitle = "";
         taskDescription = null;
-        taskPriorityId = 2;
+        taskPriorityId = TaskPriority.Medium;
         taskDueDate = DateTime.Today.AddDays(7);
         taskError = null;
         showTaskModal = true;
@@ -374,7 +374,7 @@
                 Title = taskTitle,
                 Description = taskDescription,
                 ProjectId = ProjectId > 0 ? ProjectId : 1, // Default fallback if global board
-                StatusId = 1,
+                StatusId = AppTaskStatus.Todo,
                 PriorityId = taskPriorityId,
                 DueDate = taskDueDate
             };
@@ -399,21 +399,21 @@
         }
     }
 
-    private string GetPriorityBadge(long priorityId) => priorityId switch
+    private string GetPriorityBadge(TaskPriority priorityId) => priorityId switch
     {
-        1 => "bg-slate-100 text-slate-600",
-        2 => "bg-amber-100 text-amber-700",
-        3 => "bg-red-100 text-red-700",
+        TaskPriority.Low => "bg-slate-100 text-slate-600",
+        TaskPriority.Medium => "bg-amber-100 text-amber-700",
+        TaskPriority.High => "bg-red-100 text-red-700",
         _ => "bg-slate-100 text-slate-600"
     };
 
-    private string GetPriorityLabel(long priorityId) => priorityId switch
+    private string GetPriorityLabel(TaskPriority priorityId) => priorityId switch
     {
-        1 => "Low",
-        2 => "Medium",
-        3 => "High",
-        _ => "—"
+        TaskPriority.Low => "Low",
+        TaskPriority.Medium => "Medium",
+        TaskPriority.High => "High",
+        _ => "—"
     };
 
-    private record KanbanColumn(long StatusId, string Name, string DotColor);
+    private record KanbanColumn(AppTaskStatus StatusId, string Name, string DotColor);
 }

TaskTrackingSystem.WebApp/Components/Pages/OverdueTasksReport.razor

@@ -166,7 +166,7 @@
                                 <td class="px-6 py-4">
                                     <span class="inline-flex items-center gap-1 text-sm text-slate-600">
                                         <i data-lucide="folder" class="h-3.5 w-3.5 text-violet-500"></i>
-                                        @(project?.Name ?? "—")
+                                        @(project?.Name ?? "—")
                                     </span>
                                 </td>
                                 <td class="px-6 py-4">
@@ -207,25 +207,25 @@
                                     }
                                 </td>
                                 <td class="px-6 py-4">
-                                    @{
-                                        var (priorityLabel, priorityClass) = task.PriorityId switch {
-                                            3 => ("High", "bg-rose-50 text-rose-700"),
-                                            2 => ("Medium", "bg-amber-50 text-amber-700"),
-                                            _ => ("Low", "bg-slate-100 text-slate-600")
-                                        };
-                                    }
-                                    <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium @priorityClass">@priorityLabel</span>
-                                </td>
-                                <td class="px-6 py-4">
-                                    @{
-                                        var (statusLabel, statusClass) = task.StatusId switch {
-                                            2 => ("In Progress", "bg-blue-50 text-blue-700"),
-                                            3 => ("Done", "bg-emerald-50 text-emerald-700"),
-                                            _ => ("To Do", "bg-slate-100 text-slate-600")
-                                        };
-                                    }
-                                    <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium @statusClass">@statusLabel</span>
-                                </td>
+                                     @{
+                                         var (priorityLabel, priorityClass) = task.PriorityId switch {
+                                             TaskPriority.High => ("High", "bg-rose-50 text-rose-700"),
+                                             TaskPriority.Medium => ("Medium", "bg-amber-50 text-amber-700"),
+                                             _ => ("Low", "bg-slate-100 text-slate-600")
+                                         };
+                                     }
+                                     <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium @priorityClass">@priorityLabel</span>
+                                 </td>
+                                 <td class="px-6 py-4">
+                                     @{
+                                         var (statusLabel, statusClass) = task.StatusId switch {
+                                             AppTaskStatus.InProgress => ("In Progress", "bg-blue-50 text-blue-700"),
+                                             AppTaskStatus.Done => ("Done", "bg-emerald-50 text-emerald-700"),
+                                             _ => ("To Do", "bg-slate-100 text-slate-600")
+                                         };
+                                     }
+                                     <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium @statusClass">@statusLabel</span>
+                                 </td>
                                 <td class="px-6 py-4 text-right space-x-3 whitespace-nowrap">
                                     <button @onclick="() => RemindAssignee(task)" class="text-xs font-semibold text-violet-600 hover:text-violet-900 transition-colors font-sans">
                                         Remind
@@ -326,7 +326,7 @@
             var result = allTasks.AsEnumerable();
 
             // Only show non-completed tasks that are overdue or due soon
-            result = result.Where(t => t.StatusId != 3); // exclude Done
+            result = result.Where(t => t.StatusId != AppTaskStatus.Done); // exclude Done
 
             if (appliedDelayType == "overdue")
                 result = result.Where(t => t.DueDate < today);
@@ -349,7 +349,7 @@
             }
 
             if (appliedPriority > 0)
-                result = result.Where(t => t.PriorityId == appliedPriority);
+                result = result.Where(t => (int)t.PriorityId == appliedPriority);
 
             return result.OrderBy(t => t.Title).ThenBy(t => t.DueDate);
         }
@@ -388,10 +388,10 @@
     private void ComputeSummary()
     {
         var today = DateTime.Today;
-        var activeTasks = allTasks.Where(t => t.StatusId != 3).ToList();
+        var activeTasks = allTasks.Where(t => t.StatusId != AppTaskStatus.Done).ToList();
         var overdueTasks = activeTasks.Where(t => t.DueDate < today).ToList();
         overdueCount = overdueTasks.Count;
-        criticalCount = overdueTasks.Count(t => t.PriorityId == 3);
+        criticalCount = overdueTasks.Count(t => t.PriorityId == TaskPriority.High);
         dueSoonCount = activeTasks.Count(t => t.DueDate >= today && t.DueDate <= today.AddDays(3));
         avgDaysOverdue = overdueTasks.Any()
             ? (int)overdueTasks.Average(t => (today - t.DueDate).Days)
@@ -427,8 +427,8 @@
             var daysOver = (DateTime.Today - task.DueDate).Days;
             var assignee = allUsers.FirstOrDefault(u => u.Id == task.AssignedTo);
             var project = allProjects.FirstOrDefault(p => p.Id == task.ProjectId);
-            var priority = task.PriorityId switch { 3 => "High", 2 => "Medium", _ => "Low" };
-            var status = task.StatusId switch { 2 => "In Progress", 3 => "Done", _ => "To Do" };
+            var priority = task.PriorityId switch { TaskPriority.High => "High", TaskPriority.Medium => "Medium", _ => "Low" };
+            var status = task.StatusId switch { AppTaskStatus.InProgress => "In Progress", AppTaskStatus.Done => "Done", _ => "To Do" };
 
             return new object?[]
             {
@@ -477,8 +477,8 @@
             var daysOver = (DateTime.Today - task.DueDate).Days;
             var assignee = allUsers.FirstOrDefault(u => u.Id == task.AssignedTo);
             var project = allProjects.FirstOrDefault(p => p.Id == task.ProjectId);
-            var priority = task.PriorityId switch { 3 => "High", 2 => "Medium", _ => "Low" };
-            var status = task.StatusId switch { 2 => "In Progress", 3 => "Done", _ => "To Do" };
+            var priority = task.PriorityId switch { TaskPriority.High => "High", TaskPriority.Medium => "Medium", _ => "Low" };
+            var status = task.StatusId switch { AppTaskStatus.InProgress => "In Progress", AppTaskStatus.Done => "Done", _ => "To Do" };
             return new[]
             {
                 task.Title,

TaskTrackingSystem.WebApp/Components/Pages/Register.razor

@@ -64,7 +64,7 @@
 
             @if (!string.IsNullOrEmpty(Error))
             {
-                <div class="p-3 rounded-lg border" style="background-color: var(--status-warning-bg); border-color: rgba(255, 191, 89, 0.2);">
+                <div class="p-3 rounded-lg border" style="background-color: var(--status-warning-bg); border-color: rgba(153, 27, 27, 0.2);">
                     <p class="text-sm text-center" style="color: var(--text-primary); font-weight: 500;">@Error</p>
                 </div>
             }

TaskTrackingSystem.WebApp/Components/Pages/Roles.razor

@@ -190,7 +190,7 @@
                     {
                         <p class="text-xs text-slate-400 flex items-center gap-1">
                             <i data-lucide="info" class="h-3.5 w-3.5 shrink-0"></i>
-                            Pick access on the right — it will be assigned when you create.
+                            Choose what this role can see and do on the right. It will be saved with the role.
                         </p>
                     }
                 </div>
@@ -199,26 +199,32 @@
                 @if (!isEditing)
                 {
                     <div class="w-7/12 flex flex-col min-h-0 border-l border-slate-100">
-                        <!-- Permission panel header -->
-                        <div class="px-5 py-3 border-b border-slate-100 bg-slate-50/60 shrink-0 flex items-center justify-between">
-                            <div class="flex items-center gap-2">
+                        <div class="px-5 py-3 border-b border-slate-100 bg-slate-50/60 shrink-0 flex items-center justify-between gap-3">
+                            <div class="flex items-center gap-2 min-w-0">
                                 <i data-lucide="shield-check" class="h-4 w-4 text-violet-500"></i>
                                 <span class="text-sm font-semibold text-slate-700">Assign Access</span>
+                                <span class="hidden md:inline text-xs text-slate-400">Pages control where the role can go. Actions control what it can do.</span>
+                            </div>
+                            <div class="flex items-center gap-2">
+                                <div class="relative w-36 sm:w-44">
+                                    <i data-lucide="search" class="pointer-events-none absolute left-2.5 top-2.5 h-3.5 w-3.5 text-slate-400"></i>
+                                    <input @bind-value="formAccessSearch" @bind-value:event="oninput" type="text" placeholder="Search"
+                                           class="w-full rounded-lg border border-slate-200 bg-white pl-8 pr-3 py-2 text-xs text-slate-700 placeholder:text-slate-400 focus:outline-none focus:ring-2 focus:ring-violet-600 focus:border-transparent" />
+                                </div>
+                                @if (formAccessItems.Any())
+                                {
+                                    <label class="flex items-center gap-1.5 cursor-pointer group whitespace-nowrap">
+                                        <input type="checkbox"
+                                               checked="@IsAllFormAccessSelected"
+                                               @onchange="ToggleSelectAllFormAccess"
+                                               class="h-3.5 w-3.5 rounded accent-violet-600" />
+                                        <span class="text-xs text-slate-500 group-hover:text-violet-600 transition-colors">All</span>
+                                    </label>
+                                }
                             </div>
-                            @if (formAccessItems.Any())
-                            {
-                                <label class="flex items-center gap-1.5 cursor-pointer group">
-                                    <input type="checkbox"
-                                           checked="@IsAllFormAccessSelected"
-                                           @onchange="ToggleSelectAllFormAccess"
-                                           class="h-3.5 w-3.5 rounded accent-violet-600" />
-                                    <span class="text-xs text-slate-500 group-hover:text-violet-600 transition-colors">Select All</span>
-                                </label>
-                            }
                         </div>
 
-                        <!-- Permission items -->
-                        <div class="overflow-y-auto flex-1 px-5 py-4 space-y-4">
+                        <div class="overflow-y-auto flex-1 px-4 py-4">
                             @if (isLoadingFormAccessItems)
                             {
                                 <div class="flex items-center justify-center py-10">
@@ -234,84 +240,114 @@
                             }
                             else
                             {
-                                @foreach (var parent in formAccessItems.Where(m => string.IsNullOrEmpty(m.ParentCode) || m.ParentCode == "0").OrderBy(m => m.OrderNo))
-                                {
-                                    var children = formAccessItems.Where(c => c.ParentCode == parent.MenuCode).OrderBy(c => c.OrderNo).ToList();
-                                    var parentChecked = formSelectedAccessCodes.Contains(parent.MenuCode);
-
-                                    <div class="mb-3 rounded-xl border border-slate-100 overflow-hidden shadow-sm">
-                                        <!-- Parent Row -->
-                                        <label class="flex items-center gap-3 px-4 py-2.5 bg-slate-50/80 cursor-pointer hover:bg-slate-100 transition-colors">
-                                            <input type="checkbox" checked="@parentChecked"
-                                                   @onchange="(e) => ToggleAccessSelection(parent, (bool)(e.Value ?? false), isForm: true)"
-                                                   class="h-4 w-4 rounded border-slate-300 accent-violet-600" />
-                                            <div class="flex items-center gap-2 flex-1">
-                                                @if (!string.IsNullOrEmpty(parent.Icon))
-                                                {
-                                                    <i data-lucide="@parent.Icon" class="h-4 w-4 text-violet-500 shrink-0"></i>
-                                                }
-                                                <span class="text-sm font-semibold text-slate-800">@parent.MenuName</span>
-                                            </div>
-                                        </label>
+                                <div class="mb-4 rounded-xl border border-slate-100 bg-slate-50/60 px-4 py-3 text-xs text-slate-500 flex items-center justify-between">
+                                    <span>Page access lets the role open this section. Permissions let it use the buttons and actions inside.</span>
+                                    <span class="font-medium text-slate-400">@formSelectedAccessCodes.Count selected</span>
+                                </div>
 
-                                        @if (children.Any())
+                                @if (GetRootAccessItems(true).Any())
+                                {
+                                    <div class="grid grid-cols-1 xl:grid-cols-2 gap-3">
+                                        @foreach (var parent in GetRootAccessItems(true))
                                         {
-                                            <!-- Submenus inside Card -->
-                                            <div class="divide-y divide-slate-100 bg-white">
-                                                @foreach (var child in children)
-                                                {
-                                                    var childChecked = formSelectedAccessCodes.Contains(child.MenuCode);
-                                                    <div class="pl-8 pr-4 py-2.5">
-                                                        <label class="flex items-center gap-3 cursor-pointer hover:text-violet-600 transition-colors mb-1.5">
-                                                            <input type="checkbox" checked="@childChecked"
-                                                                   @onchange="(e) => ToggleAccessSelection(child, (bool)(e.Value ?? false), isForm: true)"
-                                                                   class="h-4 w-4 rounded border-slate-300 accent-violet-600" />
-                                                            <span class="text-sm font-medium text-slate-700">@child.MenuName</span>
-                                                        </label>
-
-                                                        @if (child.Permissions.Any())
+                                            var children = GetChildAccessItems(parent, true).ToList();
+                                            var parentChecked = formSelectedAccessCodes.Contains(parent.MenuCode);
+
+                                            <div class="rounded-2xl border border-slate-200 bg-white shadow-sm overflow-hidden">
+                                                <label class="flex items-start gap-3 px-4 py-3 bg-gradient-to-r from-slate-50 to-white cursor-pointer hover:bg-slate-50 transition-colors">
+                                                    <input type="checkbox" checked="@parentChecked"
+                                                           @onchange="(e) => ToggleAccessSelection(parent, (bool)(e.Value ?? false), isForm: true)"
+                                                           class="mt-0.5 h-4 w-4 rounded border-slate-300 accent-violet-600" />
+                                                    <div class="flex min-w-0 flex-1 items-start gap-2">
+                                                        @if (!string.IsNullOrEmpty(parent.Icon))
                                                         {
-                                                            <div class="flex flex-wrap gap-2 pl-7 mt-1">
-                                                                @foreach (var action in child.Permissions)
-                                                                {
-                                                                    var isActionChecked = formSelectedAccessCodes.Contains(action.PermissionCode);
-                                                                    <label class="inline-flex items-center gap-1.5 px-2.5 py-1 rounded-md border cursor-pointer select-none transition-all
-                                                                                  @(isActionChecked
-                                                                                      ? "bg-violet-50 border-violet-200 text-violet-700"
-                                                                                      : "bg-white border-slate-200 text-slate-500 hover:border-violet-200 hover:text-violet-500")">
-                                                                        <input type="checkbox" checked="@isActionChecked"
-                                                                               @onchange="(e) => TogglePermissionSelection(action.PermissionCode, (bool)(e.Value ?? false), isForm: true)"
-                                                                               class="h-3 w-3 rounded accent-violet-600" />
-                                                                        <span class="text-xs">@action.ActionName</span>
-                                                                    </label>
-                                                                }
-                                                            </div>
+                                                            <i data-lucide="@parent.Icon" class="mt-0.5 h-4 w-4 text-violet-500 shrink-0"></i>
                                                         }
+                                                        <div class="min-w-0 flex-1">
+                                                            <div class="flex items-center gap-2">
+                                                                <span class="text-sm font-semibold text-slate-800 truncate">@parent.MenuName</span>
+                                                                <span class="rounded-full bg-violet-50 px-2 py-0.5 text-[10px] font-semibold uppercase tracking-wide text-violet-600">Menu</span>
+                                                            </div>
+                                                            <div class="text-[11px] text-slate-400 truncate">@parent.MenuCode</div>
+                                                        </div>
                                                     </div>
-                                                }
-                                            </div>
-                                        }
-                                        else if (parent.Permissions.Any())
-                                        {
-                                                    <!-- Direct Access under Parent -->
-                                            <div class="px-5 py-2.5 bg-white flex flex-wrap gap-2">
-                                                @foreach (var action in parent.Permissions)
+                                                </label>
+
+                                            <div class="border-t border-slate-100 px-3 py-3">
+                                                @if (parent.Permissions.Any())
                                                 {
-                                                    var isActionChecked = formSelectedAccessCodes.Contains(action.PermissionCode);
-                                                    <label class="inline-flex items-center gap-1.5 px-2.5 py-1 rounded-lg border cursor-pointer select-none transition-all
-                                                                  @(isActionChecked
-                                                                      ? "bg-violet-50 border-violet-200 text-violet-700 shadow-sm"
-                                                                      : "bg-white border-slate-200 text-slate-500 hover:border-violet-200 hover:text-violet-500")">
-                                                        <input type="checkbox" checked="@isActionChecked"
-                                                               @onchange="(e) => TogglePermissionSelection(action.PermissionCode, (bool)(e.Value ?? false), isForm: true)"
-                                                               class="h-3.5 w-3.5 rounded accent-violet-600" />
-                                                        <span class="text-xs font-medium">@action.ActionName</span>
-                                                    </label>
+                                                    <div class="mb-3">
+                                                        <div class="mb-2 flex items-center justify-between px-1">
+                                                            <span class="text-[11px] font-semibold uppercase tracking-wide text-slate-400">Actions</span>
+                                                            <span class="text-[11px] text-slate-400">CRUD permissions for this page</span>
+                                                        </div>
+                                                        <div class="flex flex-wrap gap-2">
+                                                            @foreach (var action in parent.Permissions)
+                                                            {
+                                                                var isActionChecked = formSelectedAccessCodes.Contains(action.PermissionCode);
+                                                                <label class="inline-flex items-center gap-1.5 rounded-full border px-2.5 py-1 text-[11px] cursor-pointer select-none transition-all
+                                                                              @(isActionChecked
+                                                                                  ? "bg-violet-50 border-violet-200 text-violet-700"
+                                                                                  : "bg-white border-slate-200 text-slate-500 hover:border-violet-200 hover:text-violet-500")">
+                                                                    <input type="checkbox" checked="@isActionChecked"
+                                                                           @onchange="(e) => TogglePermissionSelection(action.PermissionCode, (bool)(e.Value ?? false), isForm: true)"
+                                                                           class="h-3.5 w-3.5 rounded accent-violet-600" />
+                                                                    <span>@action.ActionName</span>
+                                                                </label>
+                                                            }
+                                                        </div>
+                                                    </div>
                                                 }
+
+                                                @if (children.Any())
+                                                {
+                                                    <div class="space-y-2">
+                                                        @foreach (var child in children)
+                                                        {
+                                                            var childChecked = formSelectedAccessCodes.Contains(child.MenuCode);
+                                                                <div class="rounded-xl border border-slate-100 bg-slate-50/50 p-3">
+                                                                    <label class="flex items-center gap-2 cursor-pointer">
+                                                                        <input type="checkbox" checked="@childChecked"
+                                                                               @onchange="(e) => ToggleAccessSelection(child, (bool)(e.Value ?? false), isForm: true)"
+                                                                               class="h-4 w-4 rounded border-slate-300 accent-violet-600" />
+                                                                        <span class="text-sm font-medium text-slate-700">@child.MenuName</span>
+                                                                    </label>
+
+                                                                    @if (child.Permissions.Any())
+                                                                    {
+                                                                        <div class="mt-2 flex flex-wrap gap-2 pl-6">
+                                                                            @foreach (var action in child.Permissions)
+                                                                            {
+                                                                                var isActionChecked = formSelectedAccessCodes.Contains(action.PermissionCode);
+                                                                                <label class="inline-flex items-center gap-1.5 rounded-full border px-2.5 py-1 text-[11px] cursor-pointer select-none transition-all
+                                                                                              @(isActionChecked
+                                                                                                  ? "bg-violet-50 border-violet-200 text-violet-700"
+                                                                                                  : "bg-white border-slate-200 text-slate-500 hover:border-violet-200 hover:text-violet-500")">
+                                                                                    <input type="checkbox" checked="@isActionChecked"
+                                                                                           @onchange="(e) => TogglePermissionSelection(action.PermissionCode, (bool)(e.Value ?? false), isForm: true)"
+                                                                                           class="h-3 w-3 rounded accent-violet-600" />
+                                                                                    <span>@action.ActionName</span>
+                                                                                </label>
+                                                                            }
+                                                                        </div>
+                                                                    }
+                                                                </div>
+                                                            }
+                                                        </div>
+                                                    }
+                                                    else if (!parent.Permissions.Any())
+                                                    {
+                                                        <p class="text-xs text-slate-400">Nothing else is available inside this page.</p>
+                                                    }
+                                                </div>
                                             </div>
                                         }
                                     </div>
                                 }
+                                else
+                                {
+                                    <p class="py-10 text-center text-sm text-slate-400">No pages or permissions match your search.</p>
+                                }
                             }
                         </div>
                     </div>
@@ -323,8 +359,8 @@
                 <span class="text-xs text-slate-400">
                     @if (!isEditing && formSelectedAccessCodes.Count > 0)
                     {
-                        <span class="text-violet-600 font-medium">@formSelectedAccessCodes.Count access item(s)</span>
-                        <span> will be assigned</span>
+                        <span class="text-violet-600 font-medium">@formSelectedAccessCodes.Count selected item(s)</span>
+                        <span> will be saved</span>
                     }
                 </span>
                 <div class="flex items-center gap-3">
@@ -350,7 +386,7 @@
 @if (showAccessModal)
 {
     <div class="fixed inset-0 z-50 flex items-center justify-center bg-black/40 backdrop-blur-sm">
-        <div class="bg-white rounded-2xl shadow-2xl w-full max-w-2xl mx-4 overflow-hidden flex flex-col" style="max-height: 85vh;">
+        <div class="bg-white rounded-2xl shadow-2xl w-full max-w-6xl mx-4 overflow-hidden flex flex-col" style="max-height: 88vh;">
 
             <!-- Header -->
             <div class="flex items-center justify-between px-6 py-4 border-b border-slate-100 bg-gradient-to-r from-violet-50 to-indigo-50">
@@ -369,17 +405,27 @@
             </div>
 
             <!-- Select All Bar -->
-            <div class="px-6 py-3 border-b border-slate-100 bg-slate-50/60 flex items-center justify-between">
-                <label class="flex items-center gap-2 cursor-pointer">
-                    <input type="checkbox" checked="@IsAllAccessSelected" @onchange="ToggleSelectAllAccess"
-                           class="h-4 w-4 rounded border-slate-300 accent-violet-600" />
-                    <span class="text-sm font-medium text-slate-700">Select All Access</span>
-                </label>
-                <span class="text-xs text-slate-400">@selectedAccessCodes.Count access item(s) selected</span>
+            <div class="px-6 py-3 border-b border-slate-100 bg-slate-50/60 flex items-center justify-between gap-3">
+                <div class="flex items-center gap-2 min-w-0">
+                    <label class="flex items-center gap-2 cursor-pointer">
+                        <input type="checkbox" checked="@IsAllAccessSelected" @onchange="ToggleSelectAllAccess"
+                               class="h-4 w-4 rounded border-slate-300 accent-violet-600" />
+                        <span class="text-sm font-medium text-slate-700">Select All</span>
+                    </label>
+                    <span class="hidden md:inline text-xs text-slate-400">Menus open pages. Permissions unlock actions.</span>
+                </div>
+                <div class="flex items-center gap-2">
+                    <div class="relative w-36 sm:w-48">
+                        <i data-lucide="search" class="pointer-events-none absolute left-2.5 top-2.5 h-3.5 w-3.5 text-slate-400"></i>
+                        <input @bind-value="accessSearch" @bind-value:event="oninput" type="text" placeholder="Search"
+                               class="w-full rounded-lg border border-slate-200 bg-white pl-8 pr-3 py-2 text-xs text-slate-700 placeholder:text-slate-400 focus:outline-none focus:ring-2 focus:ring-violet-600 focus:border-transparent" />
+                    </div>
+                    <span class="text-xs text-slate-400 whitespace-nowrap">@selectedAccessCodes.Count selected</span>
+                </div>
             </div>
 
             <!-- Menu Items Body -->
-            <div class="overflow-y-auto flex-1 px-6 py-4">
+            <div class="overflow-y-auto flex-1 px-4 py-4">
                 @if (isLoadingAccessItems)
                 {
                     <div class="flex items-center justify-center py-12">
@@ -398,84 +444,114 @@
                 }
                 else
                 {
-                    @foreach (var parent in accessItems.Where(m => string.IsNullOrEmpty(m.ParentCode) || m.ParentCode == "0").OrderBy(m => m.OrderNo))
-                    {
-                        var children = accessItems.Where(c => c.ParentCode == parent.MenuCode).OrderBy(c => c.OrderNo).ToList();
-                        var parentChecked = selectedAccessCodes.Contains(parent.MenuCode);
-
-                        <div class="mb-4 rounded-xl border border-slate-100 overflow-hidden shadow-sm">
-                            <!-- Parent Row -->
-                            <label class="flex items-center gap-3 px-4 py-3 bg-slate-50/80 cursor-pointer hover:bg-slate-100 transition-colors">
-                                <input type="checkbox" checked="@parentChecked"
-                                       @onchange="(e) => ToggleAccessSelection(parent, (bool)(e.Value ?? false), isForm: false)"
-                                       class="h-4 w-4 rounded border-slate-300 accent-violet-600" />
-                                <div class="flex items-center gap-2 flex-1">
-                                    @if (!string.IsNullOrEmpty(parent.Icon))
-                                    {
-                                        <i data-lucide="@parent.Icon" class="h-4 w-4 text-violet-500 shrink-0"></i>
-                                    }
-                                    <span class="text-sm font-semibold text-slate-800">@parent.MenuName</span>
-                                </div>
-                            </label>
+                    <div class="mb-4 rounded-xl border border-slate-100 bg-slate-50/60 px-4 py-3 text-xs text-slate-500 flex items-center justify-between">
+                        <span>Choosing an action also turns on its page. Turning off a page clears the actions inside it.</span>
+                        <span class="font-medium text-slate-400">@selectedAccessCodes.Count selected</span>
+                    </div>
 
-                            @if (children.Any())
+                    @if (GetRootAccessItems(false).Any())
+                    {
+                        <div class="grid grid-cols-1 xl:grid-cols-2 gap-3">
+                            @foreach (var parent in GetRootAccessItems(false))
                             {
-                                <!-- Submenus inside Card -->
-                                <div class="divide-y divide-slate-100 bg-white">
-                                    @foreach (var child in children)
-                                    {
-                                        var childChecked = selectedAccessCodes.Contains(child.MenuCode);
-                                        <div class="pl-8 pr-4 py-3">
-                                            <label class="flex items-center gap-3 cursor-pointer hover:text-violet-600 transition-colors mb-2">
-                                                <input type="checkbox" checked="@childChecked"
-                                                       @onchange="(e) => ToggleAccessSelection(child, (bool)(e.Value ?? false), isForm: false)"
-                                                       class="h-4 w-4 rounded border-slate-300 accent-violet-600" />
-                                                <span class="text-sm font-medium text-slate-700">@child.MenuName</span>
-                                            </label>
-
-                                            @if (child.Permissions.Any())
+                                var children = GetChildAccessItems(parent, false).ToList();
+                                var parentChecked = selectedAccessCodes.Contains(parent.MenuCode);
+
+                                <div class="rounded-2xl border border-slate-200 bg-white shadow-sm overflow-hidden">
+                                    <label class="flex items-start gap-3 px-4 py-3 bg-gradient-to-r from-slate-50 to-white cursor-pointer hover:bg-slate-50 transition-colors">
+                                        <input type="checkbox" checked="@parentChecked"
+                                               @onchange="(e) => ToggleAccessSelection(parent, (bool)(e.Value ?? false), isForm: false)"
+                                               class="mt-0.5 h-4 w-4 rounded border-slate-300 accent-violet-600" />
+                                        <div class="flex min-w-0 flex-1 items-start gap-2">
+                                            @if (!string.IsNullOrEmpty(parent.Icon))
                                             {
-                                                <div class="flex flex-wrap gap-2 pl-7 mt-1.5">
-                                                    @foreach (var action in child.Permissions)
+                                                <i data-lucide="@parent.Icon" class="mt-0.5 h-4 w-4 text-violet-500 shrink-0"></i>
+                                            }
+                                            <div class="min-w-0 flex-1">
+                                                <div class="flex items-center gap-2">
+                                                    <span class="text-sm font-semibold text-slate-800 truncate">@parent.MenuName</span>
+                                                    <span class="rounded-full bg-violet-50 px-2 py-0.5 text-[10px] font-semibold uppercase tracking-wide text-violet-600">Menu</span>
+                                                </div>
+                                                <div class="text-[11px] text-slate-400 truncate">@parent.MenuCode</div>
+                                            </div>
+                                        </div>
+                                    </label>
+
+                                    <div class="border-t border-slate-100 px-3 py-3">
+                                        @if (parent.Permissions.Any())
+                                        {
+                                            <div class="mb-3">
+                                                <div class="mb-2 flex items-center justify-between px-1">
+                                                    <span class="text-[11px] font-semibold uppercase tracking-wide text-slate-400">Actions</span>
+                                                    <span class="text-[11px] text-slate-400">CRUD permissions for this page</span>
+                                                </div>
+                                                <div class="flex flex-wrap gap-2">
+                                                    @foreach (var action in parent.Permissions)
                                                     {
                                                         var isActionChecked = selectedAccessCodes.Contains(action.PermissionCode);
-                                                        <label class="inline-flex items-center gap-1.5 px-2.5 py-1 rounded-md border cursor-pointer select-none transition-all
+                                                        <label class="inline-flex items-center gap-1.5 rounded-full border px-2.5 py-1 text-[11px] cursor-pointer select-none transition-all
                                                                       @(isActionChecked
                                                                           ? "bg-violet-50 border-violet-200 text-violet-700"
                                                                           : "bg-white border-slate-200 text-slate-500 hover:border-violet-200 hover:text-violet-500")">
                                                             <input type="checkbox" checked="@isActionChecked"
                                                                    @onchange="(e) => TogglePermissionSelection(action.PermissionCode, (bool)(e.Value ?? false), isForm: false)"
-                                                                   class="h-3 w-3 rounded accent-violet-600" />
-                                                            <span class="text-xs">@action.ActionName</span>
+                                                                   class="h-3.5 w-3.5 rounded accent-violet-600" />
+                                                            <span>@action.ActionName</span>
                                                         </label>
                                                     }
                                                 </div>
-                                            }
-                                        </div>
-                                    }
-                                </div>
-                            }
-                            else if (parent.Permissions.Any())
-                            {
-                                            <!-- Direct Access under Parent -->
-                                <div class="px-6 py-3.5 bg-white flex flex-wrap gap-2.5">
-                                    @foreach (var action in parent.Permissions)
-                                    {
-                                        var isActionChecked = selectedAccessCodes.Contains(action.PermissionCode);
-                                        <label class="inline-flex items-center gap-1.5 px-3 py-1.5 rounded-lg border cursor-pointer select-none transition-all
-                                                      @(isActionChecked
-                                                          ? "bg-violet-50 border-violet-300 text-violet-700 shadow-sm"
-                                                          : "bg-white border-slate-200 text-slate-500 hover:border-violet-200 hover:text-violet-500")">
-                                            <input type="checkbox" checked="@isActionChecked"
-                                                   @onchange="(e) => TogglePermissionSelection(action.PermissionCode, (bool)(e.Value ?? false), isForm: false)"
-                                                   class="h-3.5 w-3.5 rounded accent-violet-600" />
-                                            <span class="text-xs font-medium">@action.ActionName</span>
-                                        </label>
-                                    }
+                                            </div>
+                                        }
+
+                                        @if (children.Any())
+                                        {
+                                            <div class="space-y-2">
+                                                @foreach (var child in children)
+                                                {
+                                                    var childChecked = selectedAccessCodes.Contains(child.MenuCode);
+                                                    <div class="rounded-xl border border-slate-100 bg-slate-50/50 p-3">
+                                                        <label class="flex items-center gap-2 cursor-pointer">
+                                                            <input type="checkbox" checked="@childChecked"
+                                                                   @onchange="(e) => ToggleAccessSelection(child, (bool)(e.Value ?? false), isForm: false)"
+                                                                   class="h-4 w-4 rounded border-slate-300 accent-violet-600" />
+                                                            <span class="text-sm font-medium text-slate-700">@child.MenuName</span>
+                                                        </label>
+
+                                                        @if (child.Permissions.Any())
+                                                        {
+                                                            <div class="mt-2 flex flex-wrap gap-2 pl-6">
+                                                                @foreach (var action in child.Permissions)
+                                                                {
+                                                                    var isActionChecked = selectedAccessCodes.Contains(action.PermissionCode);
+                                                                    <label class="inline-flex items-center gap-1.5 rounded-full border px-2.5 py-1 text-[11px] cursor-pointer select-none transition-all
+                                                                                  @(isActionChecked
+                                                                                      ? "bg-violet-50 border-violet-200 text-violet-700"
+                                                                                      : "bg-white border-slate-200 text-slate-500 hover:border-violet-200 hover:text-violet-500")">
+                                                                        <input type="checkbox" checked="@isActionChecked"
+                                                                               @onchange="(e) => TogglePermissionSelection(action.PermissionCode, (bool)(e.Value ?? false), isForm: false)"
+                                                                               class="h-3 w-3 rounded accent-violet-600" />
+                                                                        <span>@action.ActionName</span>
+                                                                    </label>
+                                                                }
+                                                            </div>
+                                                        }
+                                                    </div>
+                                                }
+                                            </div>
+                                        }
+                                        else if (!parent.Permissions.Any())
+                                        {
+                                            <p class="text-xs text-slate-400">Nothing else is available inside this page.</p>
+                                        }
+                                    </div>
                                 </div>
                             }
                         </div>
                     }
+                    else
+                    {
+                        <p class="py-10 text-center text-sm text-slate-400">No pages or permissions match your search.</p>
+                    }
                 }
             </div>
 
@@ -599,6 +675,7 @@
     // Inline access items in Create form
     private List<AccessMenuDto> formAccessItems = new();
     private HashSet<string> formSelectedAccessCodes = new();
+    private string formAccessSearch = "";
     private bool isLoadingFormAccessItems = false;
 
     private bool IsAllFormAccessSelected
@@ -609,6 +686,7 @@
     private string selectedRoleName = "";
     private List<AccessMenuDto> accessItems = new();
     private HashSet<string> selectedAccessCodes = new();
+    private string accessSearch = "";
     private bool isLoadingAccessItems = false;
     private bool isSavingAccess = false;
     private string? accessSaveError;
@@ -675,6 +753,7 @@
         roleNameErrorMsg = "";
         formSelectedAccessCodes = new(StringComparer.OrdinalIgnoreCase);
         formAccessItems = new();
+        formAccessSearch = "";
         isLoadingFormAccessItems = true;
         showRoleModal = true;
         StateHasChanged();
@@ -715,6 +794,7 @@
         roleNameErrorMsg = "";
         formAccessItems = new();
         formSelectedAccessCodes = new(StringComparer.OrdinalIgnoreCase);
+        formAccessSearch = "";
     }
 
     private void ToggleAccessSelection(AccessMenuDto menu, bool isChecked, bool isForm)
@@ -724,41 +804,11 @@
 
         if (isChecked)
         {
-            targetSet.Add(menu.MenuCode);
-            // Select direct actions
-            foreach (var action in menu.Permissions)
-            {
-                targetSet.Add(action.PermissionCode);
-            }
-            // Select child menus and their actions
-            var children = allMenuSource.Where(c => c.ParentCode == menu.MenuCode).ToList();
-            foreach (var child in children)
-            {
-                targetSet.Add(child.MenuCode);
-                foreach (var action in child.Permissions)
-                {
-                    targetSet.Add(action.PermissionCode);
-                }
-            }
+            AddMenuSelection(menu, allMenuSource, targetSet);
         }
         else
         {
-            targetSet.Remove(menu.MenuCode);
-            // Unselect direct actions
-            foreach (var action in menu.Permissions)
-            {
-                targetSet.Remove(action.PermissionCode);
-            }
-            // Unselect child menus and their actions
-            var children = allMenuSource.Where(c => c.ParentCode == menu.MenuCode).ToList();
-            foreach (var child in children)
-            {
-                targetSet.Remove(child.MenuCode);
-                foreach (var action in child.Permissions)
-                {
-                    targetSet.Remove(action.PermissionCode);
-                }
-            }
+            RemoveMenuSelection(menu, allMenuSource, targetSet);
         }
         StateHasChanged();
     }
@@ -766,9 +816,16 @@
     private void TogglePermissionSelection(string actionCode, bool isChecked, bool isForm)
     {
         var targetSet = isForm ? formSelectedAccessCodes : selectedAccessCodes;
+        var menuSource = isForm ? formAccessItems : accessItems;
         if (isChecked)
         {
             targetSet.Add(actionCode);
+            var permission = FindPermission(actionCode, menuSource);
+            if (permission != null)
+            {
+                EnsureMenuPathSelected(permission.ParentMenuCode, menuSource, targetSet);
+                EnsureMenuBranchVisible(permission.ParentMenuCode, menuSource, targetSet);
+            }
         }
         else
         {
@@ -798,6 +855,207 @@
         }
     }
 
+    private static bool IsRootMenu(AccessMenuDto menu)
+        => string.IsNullOrWhiteSpace(menu.ParentCode) || menu.ParentCode == "0";
+
+    private static bool MatchesSearch(string? value, string search)
+        => !string.IsNullOrWhiteSpace(value)
+           && value.Contains(search, StringComparison.OrdinalIgnoreCase);
+
+    private IEnumerable<AccessMenuDto> GetRootAccessItems(bool isForm)
+    {
+        var source = isForm ? formAccessItems : accessItems;
+        var search = (isForm ? formAccessSearch : accessSearch).Trim();
+
+        return source
+            .Where(IsRootMenu)
+            .Where(menu => string.IsNullOrWhiteSpace(search) || AccessBranchMatchesSearch(menu, source, search))
+            .OrderBy(m => m.OrderNo);
+    }
+
+    private IEnumerable<AccessMenuDto> GetChildAccessItems(AccessMenuDto parent, bool isForm)
+    {
+        var source = isForm ? formAccessItems : accessItems;
+        var search = (isForm ? formAccessSearch : accessSearch).Trim();
+
+        var children = source
+            .Where(c => c.ParentCode == parent.MenuCode)
+            .OrderBy(c => c.OrderNo);
+
+        if (string.IsNullOrWhiteSpace(search))
+        {
+            return children;
+        }
+
+        return children.Where(child => AccessBranchMatchesSearch(child, source, search));
+    }
+
+    private static bool AccessBranchMatchesSearch(AccessMenuDto menu, IReadOnlyList<AccessMenuDto> source, string search)
+    {
+        if (MatchesSearch(menu.MenuName, search) || MatchesSearch(menu.MenuCode, search) || MatchesSearch(menu.MenuUrl, search))
+        {
+            return true;
+        }
+
+        if (menu.Permissions.Any(permission =>
+                MatchesSearch(permission.ActionName, search) ||
+                MatchesSearch(permission.PermissionCode, search) ||
+                MatchesSearch(permission.ApiName, search)))
+        {
+            return true;
+        }
+
+        return source
+            .Where(child => child.ParentCode == menu.MenuCode)
+            .Any(child => AccessBranchMatchesSearch(child, source, search));
+    }
+
+    private static AccessPermissionDto? FindPermission(string actionCode, IReadOnlyList<AccessMenuDto> source)
+    {
+        foreach (var menu in source)
+        {
+            var permission = menu.Permissions.FirstOrDefault(p => string.Equals(p.PermissionCode, actionCode, StringComparison.OrdinalIgnoreCase));
+            if (permission != null)
+            {
+                return permission;
+            }
+        }
+
+        return null;
+    }
+
+    private static AccessMenuDto? FindMenu(string menuCode, IReadOnlyList<AccessMenuDto> source)
+    {
+        return source.FirstOrDefault(m => string.Equals(m.MenuCode, menuCode, StringComparison.OrdinalIgnoreCase));
+    }
+
+    private static void EnsureMenuPathSelected(string menuCode, IReadOnlyList<AccessMenuDto> source, ISet<string> targetSet)
+    {
+        var current = FindMenu(menuCode, source);
+        while (current != null)
+        {
+            targetSet.Add(current.MenuCode);
+            if (string.IsNullOrWhiteSpace(current.ParentCode) || current.ParentCode == "0")
+            {
+                break;
+            }
+
+            current = FindMenu(current.ParentCode, source);
+        }
+    }
+
+    private static void EnsureMenuBranchVisible(string menuCode, IReadOnlyList<AccessMenuDto> source, ISet<string> targetSet)
+    {
+        var menu = FindMenu(menuCode, source);
+        if (menu == null)
+        {
+            return;
+        }
+
+        targetSet.Add(menu.MenuCode);
+
+        foreach (var child in GetAutoVisibleChildren(menu, source))
+        {
+            EnsureMenuBranchVisible(child.MenuCode, source, targetSet);
+        }
+    }
+
+    private static void AddMenuSelection(AccessMenuDto menu, IReadOnlyList<AccessMenuDto> source, ISet<string> targetSet)
+    {
+        targetSet.Add(menu.MenuCode);
+        foreach (var permission in menu.Permissions)
+        {
+            targetSet.Add(permission.PermissionCode);
+        }
+
+        EnsureMenuPathSelected(menu.ParentCode, source, targetSet);
+
+        foreach (var child in GetAutoVisibleChildren(menu, source))
+        {
+            EnsureMenuBranchVisible(child.MenuCode, source, targetSet);
+        }
+    }
+
+    private static void RemoveMenuSelection(AccessMenuDto menu, IReadOnlyList<AccessMenuDto> source, ISet<string> targetSet)
+    {
+        targetSet.Remove(menu.MenuCode);
+        foreach (var permission in menu.Permissions)
+        {
+            targetSet.Remove(permission.PermissionCode);
+        }
+
+        foreach (var child in GetAutoVisibleChildren(menu, source))
+        {
+            RemoveMenuSelection(child, source, targetSet);
+        }
+
+        CleanupAncestorSelection(menu.ParentCode, source, targetSet);
+    }
+
+    private static void CleanupAncestorSelection(string parentCode, IReadOnlyList<AccessMenuDto> source, ISet<string> targetSet)
+    {
+        if (string.IsNullOrWhiteSpace(parentCode) || parentCode == "0")
+        {
+            return;
+        }
+
+        var parent = FindMenu(parentCode, source);
+        if (parent == null)
+        {
+            return;
+        }
+
+        if (HasAnySelectedInBranch(parent, source, targetSet))
+        {
+            return;
+        }
+
+        targetSet.Remove(parent.MenuCode);
+        CleanupAncestorSelection(parent.ParentCode, source, targetSet);
+    }
+
+    private static bool HasAnySelectedInBranch(AccessMenuDto menu, IReadOnlyList<AccessMenuDto> source, ISet<string> targetSet)
+    {
+        if (targetSet.Contains(menu.MenuCode) || menu.Permissions.Any(p => targetSet.Contains(p.PermissionCode)))
+        {
+            return true;
+        }
+
+        return GetAutoVisibleChildren(menu, source)
+            .Any(child => HasAnySelectedInBranch(child, source, targetSet));
+    }
+
+    private static void NormalizeAccessSelection(IReadOnlyList<AccessMenuDto> source, ISet<string> targetSet)
+    {
+        var selectedPermissions = source
+            .SelectMany(menu => menu.Permissions)
+            .Where(permission => targetSet.Contains(permission.PermissionCode))
+            .ToList();
+
+        foreach (var permission in selectedPermissions)
+        {
+            EnsureMenuPathSelected(permission.ParentMenuCode, source, targetSet);
+            EnsureMenuBranchVisible(permission.ParentMenuCode, source, targetSet);
+        }
+    }
+
+    private static IEnumerable<AccessMenuDto> GetAutoVisibleChildren(AccessMenuDto menu, IReadOnlyList<AccessMenuDto> source)
+    {
+        return source
+            .Where(m => m.ParentCode == menu.MenuCode && IsAutoVisiblePageMenu(m))
+            .OrderBy(m => m.OrderNo)
+            .ThenBy(m => m.MenuName, StringComparer.OrdinalIgnoreCase);
+    }
+
+    private static bool IsAutoVisiblePageMenu(AccessMenuDto menu)
+    {
+        var text = $"{menu.MenuName} {menu.MenuCode} {menu.MenuUrl}".Trim();
+        return text.Contains("list", StringComparison.OrdinalIgnoreCase)
+               || text.Contains("view", StringComparison.OrdinalIgnoreCase)
+               || text.Contains("dashboard", StringComparison.OrdinalIgnoreCase)
+               || text.Contains("home", StringComparison.OrdinalIgnoreCase);
+    }
+
     private void RequestSaveConfirmation()
     {
         isRoleNameError = false;
@@ -885,6 +1143,7 @@
             }
             else
             {
+                NormalizeAccessSelection(formAccessItems, formSelectedAccessCodes);
                 var dto = new CreateRoleDto
                 {
                     Name = formName,
@@ -933,6 +1192,7 @@
         selectedRoleName = role.Name;
         accessSaveError = null;
         accessSaveSuccess = null;
+        accessSearch = "";
         isLoadingAccessItems = true;
         showAccessModal = true;
         StateHasChanged();
@@ -946,6 +1206,7 @@
             // Load currently assigned access items for this role
             var assignedResult = await client.GetFromJsonAsync<Result<List<string>>>($"Role/{role.Id}/access", Serialization.CaseInsensitive);
             selectedAccessCodes = new HashSet<string>(assignedResult?.Value ?? new(), StringComparer.OrdinalIgnoreCase);
+            NormalizeAccessSelection(accessItems, selectedAccessCodes);
         }
         catch (Exception ex)
         {
@@ -964,6 +1225,7 @@
         showAccessModal = false;
         accessItems = new();
         selectedAccessCodes = new(StringComparer.OrdinalIgnoreCase);
+        accessSearch = "";
         accessSaveError = null;
         accessSaveSuccess = null;
     }
@@ -997,6 +1259,7 @@
         var client = ApiClient.CreateClient();
         try
         {
+            NormalizeAccessSelection(accessItems, selectedAccessCodes);
             var dto = new AssignAccessDto { AccessCodes = selectedAccessCodes.ToList() };
             var response = await client.PostAsJsonAsync($"Role/{selectedRoleId}/access", dto);
             if (response.IsSuccessStatusCode)

TaskTrackingSystem.WebApp/Components/Pages/TaskAssign.razor

@@ -524,35 +524,35 @@
         }
     }
 
-    private string GetStatusBadge(long statusId) => statusId switch
+    private string GetStatusBadge(AppTaskStatus statusId) => statusId switch
     {
-        1 => "bg-slate-100 text-slate-700",
-        2 => "bg-blue-100 text-blue-700",
-        3 => "bg-emerald-100 text-emerald-700",
+        AppTaskStatus.Todo => "bg-slate-100 text-slate-700",
+        AppTaskStatus.InProgress => "bg-blue-100 text-blue-700",
+        AppTaskStatus.Done => "bg-emerald-100 text-emerald-700",
         _ => "bg-slate-100 text-slate-600"
     };
 
-    private string GetStatusLabel(long statusId) => statusId switch
+    private string GetStatusLabel(AppTaskStatus statusId) => statusId switch
     {
-        1 => "To Do",
-        2 => "In Progress",
-        3 => "Done",
+        AppTaskStatus.Todo => "To Do",
+        AppTaskStatus.InProgress => "In Progress",
+        AppTaskStatus.Done => "Done",
         _ => "Unknown"
     };
 
-    private string GetPriorityBadge(long priorityId) => priorityId switch
+    private string GetPriorityBadge(TaskPriority priorityId) => priorityId switch
     {
-        1 => "bg-slate-100 text-slate-600",
-        2 => "bg-amber-100 text-amber-700",
-        3 => "bg-red-100 text-red-700",
+        TaskPriority.Low => "bg-slate-100 text-slate-600",
+        TaskPriority.Medium => "bg-amber-100 text-amber-700",
+        TaskPriority.High => "bg-red-100 text-red-700",
         _ => "bg-slate-100 text-slate-600"
     };
 
-    private string GetPriorityLabel(long priorityId) => priorityId switch
+    private string GetPriorityLabel(TaskPriority priorityId) => priorityId switch
     {
-        1 => "Low",
-        2 => "Medium",
-        3 => "High",
-        _ => "—"
+        TaskPriority.Low => "Low",
+        TaskPriority.Medium => "Medium",
+        TaskPriority.High => "High",
+        _ => "—"
     };
 }

TaskTrackingSystem.WebApp/Components/Pages/TaskDetails.razor

@@ -142,9 +142,9 @@
                         <div class="flex flex-col gap-1.5">
                             <span class="text-xs font-bold uppercase tracking-wider text-slate-400">Status</span>
                             <select value="@task.StatusId" @onchange="OnStatusChanged" class="h-9 rounded-lg border border-slate-200 px-3 text-sm text-slate-800 focus:outline-none focus:ring-2 focus:ring-violet-600 focus:border-transparent bg-white w-full transition-all cursor-pointer shadow-sm">
-                                <option value="1">To Do</option>
-                                <option value="2">In Progress</option>
-                                <option value="3">Done</option>
+                                <option value="@AppTaskStatus.Todo">To Do</option>
+                                <option value="@AppTaskStatus.InProgress">In Progress</option>
+                                <option value="@AppTaskStatus.Done">Done</option>
                             </select>
                         </div>
 
@@ -154,9 +154,9 @@
                             @if (hasTaskManagePermission)
                             {
                                 <select value="@task.PriorityId" @onchange="OnPriorityChanged" class="h-9 rounded-lg border border-slate-200 px-3 text-sm text-slate-800 focus:outline-none focus:ring-2 focus:ring-violet-600 focus:border-transparent bg-white w-full transition-all cursor-pointer shadow-sm">
-                                    <option value="1">Low</option>
-                                    <option value="2">Medium</option>
-                                    <option value="3">High</option>
+                                    <option value="@TaskPriority.Low">Low</option>
+                                    <option value="@TaskPriority.Medium">Medium</option>
+                                    <option value="@TaskPriority.High">High</option>
                                 </select>
                             }
                             else
@@ -318,7 +318,7 @@
                                                 </span>
                                                 <div class="min-w-0">
                                                     <p class="text-xs font-semibold text-slate-800 truncate" title="@file.FileName">@file.FileName</p>
-                                                    <p class="text-[10px] text-slate-400 mt-0.5 font-sans">@FormatBytes(file.FileSizeInBytes) • by @file.CreatedByName</p>
+                                                    <p class="text-[10px] text-slate-400 mt-0.5 font-sans">@FormatBytes(file.FileSizeInBytes) • by @file.CreatedByName</p>
                                                 </div>
                                             </div>
                                             <div class="flex items-center gap-1.5 shrink-0">
@@ -584,20 +584,20 @@
         }
     }
 
-    // ─── INLINE MUTATIONS ───────────────────────────────────────────────────
+    // ─── INLINE MUTATIONS ───────────────────────────────────────────────────
 
     private async Task OnStatusChanged(ChangeEventArgs e)
     {
         if (task == null) return;
-        if (long.TryParse(e.Value?.ToString(), out var newStatusId))
+        if (Enum.TryParse<AppTaskStatus>(e.Value?.ToString(), out var newStatus))
         {
             var client = ApiClient.CreateClient();
             try
             {
-                var response = await client.PatchAsync($"Task/{task.Id}/status?statusId={newStatusId}", null);
+                var response = await client.PatchAsync($"Task/{task.Id}/status?statusId={(int)newStatus}", null);
                 if (response.IsSuccessStatusCode)
                 {
-                    task.StatusId = newStatusId;
+                    task.StatusId = newStatus;
                     await OnTaskUpdated.InvokeAsync();
                     await JS.InvokeVoidAsync("initIcons");
                 }
@@ -611,9 +611,9 @@
 
     private async Task OnPriorityChanged(ChangeEventArgs e)
     {
-        if (long.TryParse(e.Value?.ToString(), out var newPriorityId))
+        if (Enum.TryParse<TaskPriority>(e.Value?.ToString(), out var newPriority))
         {
-            await UpdateTaskProperty(dto => dto.PriorityId = newPriorityId);
+            await UpdateTaskProperty(dto => dto.PriorityId = newPriority);
         }
     }
 
@@ -729,7 +729,7 @@
         isSavingTitle = false;
     }
 
-    // ─── COMMENTS ACTIONS ───────────────────────────────────────────────────
+    // ─── COMMENTS ACTIONS ───────────────────────────────────────────────────
 
     private async Task PostComment()
     {
@@ -791,7 +791,7 @@
         }
     }
 
-    // ─── ATTACHMENTS ACTIONS ────────────────────────────────────────────────
+    // ─── ATTACHMENTS ACTIONS ────────────────────────────────────────────────
 
     private async Task OnInputFileChange(InputFileChangeEventArgs e)
     {
@@ -859,7 +859,7 @@
         }
     }
 
-    // ─── CONFIRM DIALOG LOGIC ───────────────────────────────────────────────
+    // ─── CONFIRM DIALOG LOGIC ───────────────────────────────────────────────
 
     private async Task ExecuteConfirmAction()
     {
@@ -877,37 +877,37 @@
         confirmAction = null;
     }
 
-    // ─── DISPLAY UTILITIES ──────────────────────────────────────────────────
+    // ─── DISPLAY UTILITIES ──────────────────────────────────────────────────
 
-    private string GetStatusLabel(long statusId) => statusId switch
+    private string GetStatusLabel(AppTaskStatus statusId) => statusId switch
     {
-        1 => "To Do",
-        2 => "In Progress",
-        3 => "Done",
+        AppTaskStatus.Todo => "To Do",
+        AppTaskStatus.InProgress => "In Progress",
+        AppTaskStatus.Done => "Done",
         _ => "Unknown"
     };
 
-    private string GetStatusBadge(long statusId) => statusId switch
+    private string GetStatusBadge(AppTaskStatus statusId) => statusId switch
     {
-        1 => "bg-slate-100 text-slate-800 border border-slate-200",
-        2 => "bg-blue-50 text-blue-700 border border-blue-100",
-        3 => "bg-emerald-50 text-emerald-700 border border-emerald-100",
+        AppTaskStatus.Todo => "bg-slate-100 text-slate-800 border border-slate-200",
+        AppTaskStatus.InProgress => "bg-blue-50 text-blue-700 border border-blue-100",
+        AppTaskStatus.Done => "bg-emerald-50 text-emerald-700 border border-emerald-100",
         _ => "bg-slate-50 text-slate-600"
     };
 
-    private string GetPriorityLabel(long priorityId) => priorityId switch
+    private string GetPriorityLabel(TaskPriority priorityId) => priorityId switch
     {
-        1 => "Low",
-        2 => "Medium",
-        3 => "High",
+        TaskPriority.Low => "Low",
+        TaskPriority.Medium => "Medium",
+        TaskPriority.High => "High",
         _ => "Unknown"
     };
 
-    private string GetPriorityBadge(long priorityId) => priorityId switch
+    private string GetPriorityBadge(TaskPriority priorityId) => priorityId switch
     {
-        1 => "bg-slate-100 text-slate-600",
-        2 => "bg-amber-50 text-amber-700 border border-amber-100",
-        3 => "bg-rose-50 text-rose-700 border border-rose-100",
+        TaskPriority.Low => "bg-slate-100 text-slate-600",
+        TaskPriority.Medium => "bg-amber-50 text-amber-700 border border-amber-100",
+        TaskPriority.High => "bg-rose-50 text-rose-700 border border-rose-100",
         _ => "bg-slate-50 text-slate-600"
     };
 

TaskTrackingSystem.WebApp/Components/Pages/TaskReport.razor

@@ -167,21 +167,21 @@
                             <svg class="w-full max-w-[320px]" height="220" viewBox="0 0 320 220">
                                 <g transform="translate(0, 180)">
                                     <!-- Axes -->
-                                    <line x1="40" y1="0" x2="280" y2="0" stroke="#cbd5e1" stroke-width="2" />
+                                    <line x1="40" y1="0" x2="280" y2="0" stroke="#E5E7EB" stroke-width="2" />
                                     <!-- To Do Bar -->
-                                    <rect x="60" y="-@hTodo" width="40" height="@hTodo" rx="4" fill="#e2e8f0" />
-                                    <text x="80" y="20" font-size="12" fill="#64748b" text-anchor="middle">To Do</text>
-                                    <text x="80" y="-@(hTodo + 10)" font-size="12" font-weight="bold" fill="#334155" text-anchor="middle">@todo</text>
+                                    <rect x="60" y="-@hTodo" width="40" height="@hTodo" rx="4" fill="#E5E7EB" />
+                                    <text x="80" y="20" font-size="12" fill="#6B7280" text-anchor="middle">To Do</text>
+                                    <text x="80" y="-@(hTodo + 10)" font-size="12" font-weight="bold" fill="#10002B" text-anchor="middle">@todo</text>
 
                                     <!-- In Progress Bar -->
-                                    <rect x="140" y="-@hInProgress" width="40" height="@hInProgress" rx="4" fill="#3b82f6" />
-                                    <text x="160" y="20" font-size="12" fill="#64748b" text-anchor="middle">In Progress</text>
-                                    <text x="160" y="-@(hInProgress + 10)" font-size="12" font-weight="bold" fill="#334155" text-anchor="middle">@inProgress</text>
+                                    <rect x="140" y="-@hInProgress" width="40" height="@hInProgress" rx="4" fill="#06B6D4" />
+                                    <text x="160" y="20" font-size="12" fill="#6B7280" text-anchor="middle">In Progress</text>
+                                    <text x="160" y="-@(hInProgress + 10)" font-size="12" font-weight="bold" fill="#10002B" text-anchor="middle">@inProgress</text>
 
                                     <!-- Done Bar -->
-                                    <rect x="220" y="-@hDone" width="40" height="@hDone" rx="4" fill="#10b981" />
-                                    <text x="240" y="20" font-size="12" fill="#64748b" text-anchor="middle">Done</text>
-                                    <text x="240" y="-@(hDone + 10)" font-size="12" font-weight="bold" fill="#334155" text-anchor="middle">@done</text>
+                                    <rect x="220" y="-@hDone" width="40" height="@hDone" rx="4" fill="#10B981" />
+                                    <text x="240" y="20" font-size="12" fill="#6B7280" text-anchor="middle">Done</text>
+                                    <text x="240" y="-@(hDone + 10)" font-size="12" font-weight="bold" fill="#10002B" text-anchor="middle">@done</text>
                                 </g>
                             </svg>
                         }
@@ -213,7 +213,7 @@
                                         <span>@high tasks (@pctHigh%)</span>
                                     </div>
                                     <div class="h-3 rounded-full bg-slate-100 overflow-hidden">
-                                        <div class="h-full bg-rose-500 rounded-full" style="width: @pctHigh%"></div>
+                                        <div class="h-full bg-violet-600 rounded-full" style="width: @pctHigh%"></div>
                                     </div>
                                 </div>
                                 <div>
@@ -222,7 +222,7 @@
                                         <span>@med tasks (@pctMed%)</span>
                                     </div>
                                     <div class="h-3 rounded-full bg-slate-100 overflow-hidden">
-                                        <div class="h-full bg-amber-500 rounded-full" style="width: @pctMed%"></div>
+                                        <div class="h-full bg-violet-400 rounded-full" style="width: @pctMed%"></div>
                                     </div>
                                 </div>
                                 <div>
@@ -231,7 +231,7 @@
                                         <span>@low tasks (@pctLow%)</span>
                                     </div>
                                     <div class="h-3 rounded-full bg-slate-100 overflow-hidden">
-                                        <div class="h-full bg-slate-400 rounded-full" style="width: @pctLow%"></div>
+                                        <div class="h-full bg-violet-200 rounded-full" style="width: @pctLow%"></div>
                                     </div>
                                 </div>
                             </div>
@@ -287,8 +287,8 @@
                                             <path d="M45 40H75" stroke="currentColor" stroke-width="3" stroke-linecap="round" />
                                             <path d="M45 55H75" stroke="currentColor" stroke-width="3" stroke-linecap="round" />
                                             <path d="M45 70H60" stroke="currentColor" stroke-width="3" stroke-linecap="round" />
-                                            <circle cx="85" cy="85" r="15" fill="white" stroke="#7c3aed" stroke-width="3" />
-                                            <path d="M80 85L90 85M85 80L85 90" stroke="#7c3aed" stroke-width="3" stroke-linecap="round" />
+                                            <circle cx="85" cy="85" r="15" fill="white" stroke="#5A189A" stroke-width="3" />
+                                            <path d="M80 85L90 85M85 80L85 90" stroke="#5A189A" stroke-width="3" stroke-linecap="round" />
                                         </svg>
                                         <h3 class="text-lg font-semibold text-slate-700">No Tasks Found</h3>
                                         <p class="text-sm text-slate-400 max-w-xs">There are no tasks matching your filters. Try adjusting your search query or filters.</p>