add: points history

Backend/Features/Loyalty/LoyaltyAccountsController.cs

@@ -0,0 +1,39 @@
+using System.Security.Claims;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Backend.Features.Loyalty
+{
+    [ApiController]
+    [Route("api/v1/accounts")]
+    [Authorize]
+    public class LoyaltyAccountsController : ControllerBase
+    {
+        private readonly ILoyaltyService _loyaltyService;
+
+        public LoyaltyAccountsController(ILoyaltyService loyaltyService)
+        {
+            _loyaltyService = loyaltyService;
+        }
+
+        [HttpGet("{accountId}/history")]
+        public async Task<IActionResult> GetAccountHistory(string accountId)
+        {
+            // Librarians may view any account history; members may only view their own.
+            if (!User.IsInRole("Librarian"))
+            {
+                var userIdStr = User.FindFirst(ClaimTypes.NameIdentifier)?.Value;
+                if (string.IsNullOrEmpty(userIdStr)) return Unauthorized();
+
+                var myAccount = await _loyaltyService.GetUserAccountAsync(userIdStr);
+                if (myAccount == null) return NotFound("Loyalty account not found.");
+                if (!string.Equals(myAccount.Id, accountId, StringComparison.OrdinalIgnoreCase))
+                    return Forbid();
+            }
+
+            var history = await _loyaltyService.GetPointsHistoryAsync(accountId);
+            return Ok(history);
+        }
+    }
+}
+

Backend/Features/Loyalty/LoyaltyController.cs

@@ -1,9 +1,9 @@
 using Backend.Features.Subscriptions;
+using DbConnect.Data;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
 using System.Security.Claims;
-using System.Threading.Tasks;
-using System.Linq;
 
 namespace Backend.Features.Loyalty
 {
@@ -14,28 +14,25 @@ namespace Backend.Features.Loyalty
     {
         private readonly ILoyaltyService _loyaltyService;
         private readonly ISubscriptionService _subscriptionService;
+        private readonly AppDbContext _context;
 
-        public LoyaltyController(ILoyaltyService loyaltyService, ISubscriptionService subscriptionService)
+        public LoyaltyController(ILoyaltyService loyaltyService, ISubscriptionService subscriptionService, AppDbContext context)
         {
             _loyaltyService = loyaltyService;
             _subscriptionService = subscriptionService;
+            _context = context;
         }
 
+        // ── Member endpoints ──────────────────────────────────────────────────
+
         [HttpGet("my-account")]
         public async Task<IActionResult> GetMyAccount()
         {
             var userIdStr = User.FindFirst(ClaimTypes.NameIdentifier)?.Value;
-            if (string.IsNullOrEmpty(userIdStr))
-            {
-                return Unauthorized();
-            }
+            if (string.IsNullOrEmpty(userIdStr)) return Unauthorized();
 
             var account = await _loyaltyService.GetUserAccountAsync(userIdStr);
-            if (account == null)
-            {
-                return NotFound("Loyalty account not found.");
-            }
-
+            if (account == null) return NotFound("Loyalty account not found.");
             return Ok(account);
         }
 
@@ -43,34 +40,50 @@ namespace Backend.Features.Loyalty
         public async Task<IActionResult> GetMyRedemptions()
         {
             var userIdStr = User.FindFirst(ClaimTypes.NameIdentifier)?.Value;
-            if (string.IsNullOrEmpty(userIdStr))
-            {
-                return Unauthorized();
-            }
+            if (string.IsNullOrEmpty(userIdStr)) return Unauthorized();
 
-            var redemptions = await _loyaltyService.GetRedemptionsHistoryAsync();
+            // Filter to this user's redemptions only
+            var redemptions = await _loyaltyService.GetUserRedemptionsAsync(userIdStr);
             return Ok(redemptions);
         }
 
+        [HttpGet("my-pending-redemptions")]
+        public async Task<IActionResult> GetMyPendingRedemptions()
+        {
+            var userIdStr = User.FindFirst(ClaimTypes.NameIdentifier)?.Value;
+            if (string.IsNullOrEmpty(userIdStr)) return Unauthorized();
+
+            var redemptions = await _loyaltyService.GetUserRedemptionsAsync(userIdStr);
+            var pending = redemptions.Where(r => r.Status.Equals("Pending", StringComparison.OrdinalIgnoreCase));
+            return Ok(pending);
+        }
+
+        [HttpGet("my-points-history")]
+        public async Task<IActionResult> GetMyPointsHistory()
+        {
+            var userIdStr = User.FindFirst(ClaimTypes.NameIdentifier)?.Value;
+            if (string.IsNullOrEmpty(userIdStr)) return Unauthorized();
+
+            var account = await _loyaltyService.GetUserAccountAsync(userIdStr);
+            if (account == null) return NotFound("Loyalty account not found.");
+
+            var history = await _loyaltyService.GetPointsHistoryAsync(account.Id);
+            return Ok(history);
+        }
+
         [HttpPost("claim")]
         public async Task<IActionResult> ClaimReward([FromBody] ClaimRewardRequestDto request)
         {
             var userIdStr = User.FindFirst(ClaimTypes.NameIdentifier)?.Value;
-            if (string.IsNullOrEmpty(userIdStr))
-            {
-                return Unauthorized();
-            }
+            if (string.IsNullOrEmpty(userIdStr)) return Unauthorized();
 
             var (success, message) = await _loyaltyService.ClaimRewardAsync(userIdStr, request.RewardId, request.Notes ?? "Redeemed via Library Web Application");
-
-            if (success)
-            {
-                return Ok(new { message });
-            }
-
+            if (success) return Ok(new { message });
             return BadRequest(new { message });
         }
 
+        // ── Librarian endpoints ───────────────────────────────────────────────
+
         [HttpGet("admin/redemptions/pending")]
         [Authorize(Roles = "Librarian")]
         public async Task<IActionResult> GetPendingRedemptions()
@@ -79,27 +92,61 @@ namespace Backend.Features.Loyalty
             return Ok(redemptions);
         }
 
+        [HttpGet("admin/all-points-history")]
+        [Authorize(Roles = "Librarian")]
+        public async Task<IActionResult> GetAllMembersPointsHistory()
+        {
+            // Get all users from DB
+            var users = await _context.Users
+                .Select(u => new { u.Id, u.FullName, u.Email })
+                .ToListAsync();
+
+            var results = new List<object>();
+
+            foreach (var user in users)
+            {
+                try
+                {
+                    var account = await _loyaltyService.GetUserAccountAsync(user.Id.ToString());
+                    if (account == null) continue;
+
+                    var accountId = !string.IsNullOrWhiteSpace(account.Id) ? account.Id : (account.AccountId ?? string.Empty);
+                    if (string.IsNullOrWhiteSpace(accountId)) continue;
+
+                    var history = await _loyaltyService.GetPointsHistoryAsync(accountId);
+                    var redemptions = await _loyaltyService.GetUserRedemptionsAsync(user.Id.ToString());
+                    results.Add(new
+                    {
+                        userId = user.Id,
+                        userName = user.FullName,
+                        userEmail = user.Email,
+                        accountId = accountId,
+                        currentBalance = account.CurrentBalance,
+                        tier = account.Tier,
+                        history = history,
+                        redemptions = redemptions
+                    });
+                }
+                catch { /* Skip users not in loyalty system */ }
+            }
+
+            return Ok(results);
+        }
+
         [HttpPost("admin/redemptions/{id}/fulfill")]
         [Authorize(Roles = "Librarian")]
         public async Task<IActionResult> FulfillRedemption(string id)
         {
-            // 1. Get all pending redemptions to find the details of the one we want
             var pending = await _loyaltyService.GetPendingRedemptionsAsync();
             var redemption = pending.FirstOrDefault(r => r.Id == id);
 
             if (redemption == null)
-            {
                 return NotFound("Redemption record not found or already processed.");
-            }
 
-            // 2. Call the external loyalty system to mark as fulfilled
             var success = await _loyaltyService.UpdateRedemptionStatusAsync(id, "Fulfilled");
             if (!success)
-            {
                 return BadRequest("Failed to update status in the loyalty system.");
-            }
 
-            // 3. side effect: Grant membership in the library system
             bool membershipGranted = false;
             if (Guid.TryParse(redemption.ExternalUserId?.Trim(), out Guid userId))
             {
@@ -110,11 +157,11 @@ namespace Backend.Features.Loyalty
             if (!membershipGranted)
             {
                 var errorMsg = $"Redemption fulfilled in loyalty system, but failed to grant library membership. RewardName='{redemption.RewardName}', RewardId='{redemption.RewardId}' (Redemption ID: {id}).";
-                System.Diagnostics.Debug.WriteLine(errorMsg);
                 return BadRequest(new { message = errorMsg });
             }
 
             return Ok(new { message = $"Redemption fulfilled and {redemption.RewardName} membership granted successfully." });
         }
     }
+
 }

Backend/Features/Loyalty/LoyaltyService.cs

@@ -20,6 +20,8 @@ namespace Backend.Features.Loyalty
         Task<IEnumerable<LoyaltyRedemptionDto>> GetUserRedemptionsAsync(string externalUserId);
         Task<IEnumerable<LoyaltyRedemptionDto>> GetRedemptionsHistoryAsync();
         Task<bool> UpdateRedemptionStatusAsync(string redemptionId, string status);
+        Task<IEnumerable<PointHistoryEntryDto>> GetPointsHistoryAsync(string accountId);
+        Task<IEnumerable<PointHistoryEntryDto>> GetAllMembersPointsHistoryAsync();
     }
 
     public class LoyaltyService : ILoyaltyService
@@ -106,7 +108,12 @@ namespace Backend.Features.Loyalty
                 if (response.IsSuccessStatusCode)
                 {
                     var options = new JsonSerializerOptions { PropertyNameCaseInsensitive = true };
-                    return await response.Content.ReadFromJsonAsync<AccountLookupResponse>(options);
+                    var account = await response.Content.ReadFromJsonAsync<AccountLookupResponse>(options);
+                    if (account != null && string.IsNullOrWhiteSpace(account.Id) && !string.IsNullOrWhiteSpace(account.AccountId))
+                    {
+                        account.Id = account.AccountId;
+                    }
+                    return account;
                 }
                 return null;
             }
@@ -133,16 +140,19 @@ namespace Backend.Features.Loyalty
                 {
                     return (true, "Reward claimed successfully!");
                 }
-                
+
                 var error = await response.Content.ReadAsStringAsync();
                 _logger.LogWarning($"Failed to claim reward {rewardId} for user {externalUserId}: {error}");
-                
-                try {
+
+                try
+                {
                     var errorDoc = JsonDocument.Parse(error);
-                    if (errorDoc.RootElement.TryGetProperty("message", out var msgElement)) {
+                    if (errorDoc.RootElement.TryGetProperty("message", out var msgElement))
+                    {
                         return (false, msgElement.GetString() ?? "Failed to claim reward.");
                     }
-                } catch { }
+                }
+                catch { }
 
                 return (false, string.IsNullOrEmpty(error) ? "Failed to claim reward." : error);
             }
@@ -181,7 +191,7 @@ namespace Backend.Features.Loyalty
                 {
                     var rawJson = await response.Content.ReadAsStringAsync();
                     _logger.LogInformation($"Raw Pending Redemptions JSON: {rawJson}");
-                    
+
                     var options = new JsonSerializerOptions { PropertyNameCaseInsensitive = true };
                     return JsonSerializer.Deserialize<IEnumerable<LoyaltyRedemptionDto>>(rawJson, options) ?? Enumerable.Empty<LoyaltyRedemptionDto>();
                 }
@@ -226,6 +236,76 @@ namespace Backend.Features.Loyalty
                 return false;
             }
         }
+
+        public async Task<IEnumerable<PointHistoryEntryDto>> GetPointsHistoryAsync(string accountId)
+        {
+            try
+            {
+                var response = await _httpClient.GetAsync($"/api/v1/accounts/{accountId}/history");
+                if (response.IsSuccessStatusCode)
+                {
+                    var rawJson = await response.Content.ReadAsStringAsync();
+                    _logger.LogInformation("Raw Points History JSON for account {AccountId}: {Json}", accountId, rawJson);
+
+                    var options = new JsonSerializerOptions { PropertyNameCaseInsensitive = true };
+                    return JsonSerializer.Deserialize<IEnumerable<PointHistoryEntryDto>>(rawJson, options) ?? Enumerable.Empty<PointHistoryEntryDto>();
+                }
+                
+                var error = await response.Content.ReadAsStringAsync();
+                _logger.LogWarning("Points history request failed for account {AccountId}. Status={Status}. Body={Body}", accountId, response.StatusCode, error);
+                return Enumerable.Empty<PointHistoryEntryDto>();
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, $"Error fetching points history for account {accountId}.");
+                return Enumerable.Empty<PointHistoryEntryDto>();
+            }
+        }
+
+        public async Task<IEnumerable<PointHistoryEntryDto>> GetAllMembersPointsHistoryAsync()
+        {
+            return Enumerable.Empty<PointHistoryEntryDto>();
+        }
+    }
+
+    public class PointHistoryEntryDto
+    {
+        [JsonPropertyName("id")]
+        public int Id { get; set; }
+
+        [JsonPropertyName("accountId")]
+        public string AccountId { get; set; } = string.Empty;
+
+        [JsonPropertyName("externalUserId")]
+        public string? ExternalUserId { get; set; }
+
+        [JsonPropertyName("pointDelta")]
+        public double PointDelta { get; set; }
+
+        [JsonPropertyName("eventKey")]
+        public string EventKey { get; set; } = string.Empty;
+
+        [JsonPropertyName("description")]
+        public string Description { get; set; } = string.Empty;
+
+        [JsonPropertyName("referenceId")]
+        public string? ReferenceId { get; set; }
+
+        [JsonPropertyName("createdAt")]
+        public DateTime CreatedAt { get; set; }
+
+        // Optional redemption-related fields (present for REDEEM events)
+        [JsonPropertyName("rewardId")]
+        public string? RewardId { get; set; }
+
+        [JsonPropertyName("rewardName")]
+        public string? RewardName { get; set; }
+
+        [JsonPropertyName("redemptionStatus")]
+        public string? RedemptionStatus { get; set; }
+
+        [JsonPropertyName("redeemedAt")]
+        public DateTime? RedeemedAt { get; set; }
     }
 
     public class AccountLookupResponse
@@ -233,6 +313,10 @@ namespace Backend.Features.Loyalty
         [JsonPropertyName("id")]
         public string Id { get; set; } = string.Empty;
 
+        // Some loyalty API versions return `accountId` instead of `id`.
+        [JsonPropertyName("accountId")]
+        public string? AccountId { get; set; }
+
         [JsonPropertyName("externalUserId")]
         public string ExternalUserId { get; set; } = string.Empty;
 

Frontend/Controllers/RewardsController.cs

@@ -0,0 +1,92 @@
+using Frontend.Models;
+using Frontend.Models.Dtos;
+using Frontend.Services;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Frontend.Controllers
+{
+    [Authorize]
+    public class RewardsController : Controller
+    {
+        private readonly LibraryApiClient _apiClient;
+
+        public RewardsController(LibraryApiClient apiClient)
+        {
+            _apiClient = apiClient;
+        }
+
+        // Member view: available rewards + pending redemptions + points history
+        [HttpGet]
+        public async Task<IActionResult> Index()
+        {
+            var rewards = await _apiClient.GetActiveRewardsAsync();
+            var account = await _apiClient.GetMyLoyaltyAccountAsync();
+            var pending = await _apiClient.GetMyPendingRedemptionsAsync();
+            var redemptions = await _apiClient.GetMyRedemptionsAsync();
+            if (account != null && string.IsNullOrWhiteSpace(account.Id) && !string.IsNullOrWhiteSpace(account.AccountId))
+                account.Id = account.AccountId;
+
+            var history = account != null && !string.IsNullOrWhiteSpace(account.Id)
+                ? await _apiClient.GetPointsHistoryAsync(account.Id)
+                : Enumerable.Empty<PointHistoryEntryDto>();
+
+            var vm = new RewardsViewModel
+            {
+                Rewards = rewards,
+                Account = account,
+                PendingRedemptions = pending,
+                RedemptionsHistory = redemptions,
+                PointsHistory = history
+            };
+
+            return View(vm);
+        }
+
+        // Librarian view: all pending + all members' point history
+        [HttpGet]
+        [Authorize(Roles = "Librarian")]
+        public async Task<IActionResult> Manage()
+        {
+            var pending = await _apiClient.GetPendingRedemptionsAsync();
+            var allHistory = (await _apiClient.GetAllMembersPointsHistoryAsync())
+                .Select(m =>
+                {
+                    m.History = m.History?.ToList() ?? new List<PointHistoryEntryDto>();
+                    m.Redemptions = m.Redemptions?.ToList() ?? new List<LoyaltyRedemptionDto>();
+                    return m;
+                })
+                .ToList();
+
+            var vm = new LibrarianRewardsViewModel
+            {
+                PendingRedemptions = pending,
+                AllMembersHistory = allHistory
+            };
+
+            return View(vm);
+        }
+
+        // POST: fulfill a redemption (librarian)
+        [HttpPost]
+        [Authorize(Roles = "Librarian")]
+        public async Task<IActionResult> Fulfill(string id)
+        {
+            var (success, message) = await _apiClient.FulfillRedemptionAsync(id);
+            if (success)
+                TempData["Success"] = message;
+            else
+                TempData["Error"] = message;
+
+            return RedirectToAction(nameof(Manage));
+        }
+
+        // POST: redeem a reward (member)
+        [HttpPost]
+        public async Task<IActionResult> Redeem(string rewardId)
+        {
+            var (success, message) = await _apiClient.ClaimRewardAsync(rewardId, "Redeemed via Library Rewards Page");
+            return Json(new { success, message });
+        }
+    }
+}

Frontend/Models/Dtos/LibraryDtos.cs

@@ -145,6 +145,10 @@ namespace Frontend.Models.Dtos
         [JsonPropertyName("id")]
         public string Id { get; set; } = string.Empty;
 
+        // Some responses use `accountId` instead of `id`.
+        [JsonPropertyName("accountId")]
+        public string? AccountId { get; set; }
+
         [JsonPropertyName("externalUserId")]
         public string ExternalUserId { get; set; } = string.Empty;
 
@@ -224,4 +228,57 @@ namespace Frontend.Models.Dtos
     {
         public string Role { get; set; } = string.Empty;
     }
+
+    // Points History DTOs
+    public class PointHistoryEntryDto
+    {
+        [JsonPropertyName("id")]
+        public int Id { get; set; }
+        [JsonPropertyName("accountId")]
+        public string AccountId { get; set; } = string.Empty;
+        [JsonPropertyName("externalUserId")]
+        public string? ExternalUserId { get; set; }
+        [JsonPropertyName("pointDelta")]
+        public double PointDelta { get; set; }
+        [JsonPropertyName("eventKey")]
+        public string EventKey { get; set; } = string.Empty;
+        [JsonPropertyName("description")]
+        public string Description { get; set; } = string.Empty;
+        [JsonPropertyName("referenceId")]
+        public string? ReferenceId { get; set; }
+        [JsonPropertyName("createdAt")]
+        public DateTime CreatedAt { get; set; }
+
+        [JsonPropertyName("rewardId")]
+        public string? RewardId { get; set; }
+
+        [JsonPropertyName("rewardName")]
+        public string? RewardName { get; set; }
+
+        [JsonPropertyName("redemptionStatus")]
+        public string? RedemptionStatus { get; set; }
+
+        [JsonPropertyName("redeemedAt")]
+        public DateTime? RedeemedAt { get; set; }
+    }
+
+    public class UserPointsHistoryDto
+    {
+        [JsonPropertyName("userId")]
+        public Guid UserId { get; set; }
+        [JsonPropertyName("userName")]
+        public string UserName { get; set; } = string.Empty;
+        [JsonPropertyName("userEmail")]
+        public string UserEmail { get; set; } = string.Empty;
+        [JsonPropertyName("accountId")]
+        public string AccountId { get; set; } = string.Empty;
+        [JsonPropertyName("currentBalance")]
+        public double CurrentBalance { get; set; }
+        [JsonPropertyName("tier")]
+        public string Tier { get; set; } = string.Empty;
+        [JsonPropertyName("history")]
+        public IEnumerable<PointHistoryEntryDto> History { get; set; } = Enumerable.Empty<PointHistoryEntryDto>();
+        [JsonPropertyName("redemptions")]
+        public IEnumerable<LoyaltyRedemptionDto> Redemptions { get; set; } = Enumerable.Empty<LoyaltyRedemptionDto>();
+    }
 }

Frontend/Models/RewardsViewModel.cs

@@ -2,9 +2,20 @@ using Frontend.Models.Dtos;
 
 namespace Frontend.Models
 {
+    // Member rewards page view model
     public class RewardsViewModel
     {
         public IEnumerable<LoyaltyRewardDto> Rewards { get; set; } = Enumerable.Empty<LoyaltyRewardDto>();
         public LoyaltyAccountDto? Account { get; set; }
+        public IEnumerable<LoyaltyRedemptionDto> PendingRedemptions { get; set; } = Enumerable.Empty<LoyaltyRedemptionDto>();
+        public IEnumerable<LoyaltyRedemptionDto> RedemptionsHistory { get; set; } = Enumerable.Empty<LoyaltyRedemptionDto>();
+        public IEnumerable<PointHistoryEntryDto> PointsHistory { get; set; } = Enumerable.Empty<PointHistoryEntryDto>();
+    }
+
+    // Librarian rewards management view model
+    public class LibrarianRewardsViewModel
+    {
+        public IEnumerable<LoyaltyRedemptionDto> PendingRedemptions { get; set; } = Enumerable.Empty<LoyaltyRedemptionDto>();
+        public IEnumerable<UserPointsHistoryDto> AllMembersHistory { get; set; } = Enumerable.Empty<UserPointsHistoryDto>();
     }
 }

Frontend/Services/LibraryApiClient.cs

@@ -13,7 +13,7 @@ namespace Frontend.Services
         {
             _httpClient = httpClientFactory.CreateClient("LibraryBackend");
             _httpContextAccessor = httpContextAccessor;
-            
+
             AddAuthHeaderFromCookie();
         }
 
@@ -140,16 +140,20 @@ namespace Frontend.Services
 
         public async Task<SubscriptionDto?> GetMySubscriptionAsync()
         {
-            try {
+            try
+            {
                 return await _httpClient.GetFromJsonAsync<SubscriptionDto>("api/subscriptions/me");
-            } catch { return null; }
+            }
+            catch { return null; }
         }
 
         public async Task<IEnumerable<SubscriptionDto>> GetMyAllSubscriptionsAsync()
         {
-            try {
+            try
+            {
                 return await _httpClient.GetFromJsonAsync<IEnumerable<SubscriptionDto>>("api/subscriptions/me/all") ?? Enumerable.Empty<SubscriptionDto>();
-            } catch { return Enumerable.Empty<SubscriptionDto>(); }
+            }
+            catch { return Enumerable.Empty<SubscriptionDto>(); }
         }
 
         public async Task<SubscriptionDto?> SubscribeAsync(SubscribeRequest request)
@@ -160,9 +164,11 @@ namespace Frontend.Services
 
         public async Task<SubscriptionDto?> GetUserSubscriptionAsync(Guid userId)
         {
-            try {
+            try
+            {
                 return await _httpClient.GetFromJsonAsync<SubscriptionDto>($"api/subscriptions/user/{userId}");
-            } catch { return null; }
+            }
+            catch { return null; }
         }
 
         public async Task<SubscriptionDto?> AdminSubscribeAsync(AdminSubscribeRequest request)
@@ -179,7 +185,8 @@ namespace Frontend.Services
 
         public async Task<LoyaltyAccountDto?> GetMyLoyaltyAccountAsync()
         {
-            try {
+            try
+            {
                 // Using exact casing for the route to be safe
                 var response = await _httpClient.GetAsync("api/Loyalty/my-account");
                 if (response.IsSuccessStatusCode)
@@ -195,17 +202,62 @@ namespace Frontend.Services
                     // Throw custom exception or return null based on error
                 }
                 return null;
-            } catch (Exception ex) { 
+            }
+            catch (Exception ex)
+            {
                 System.Diagnostics.Debug.WriteLine($"Loyalty API Exception: {ex.Message}");
-                return null; 
+                return null;
             }
         }
 
         public async Task<IEnumerable<LoyaltyRedemptionDto>> GetMyRedemptionsAsync()
         {
-            try {
+            try
+            {
                 return await _httpClient.GetFromJsonAsync<IEnumerable<LoyaltyRedemptionDto>>("api/Loyalty/my-redemptions") ?? Enumerable.Empty<LoyaltyRedemptionDto>();
-            } catch { return Enumerable.Empty<LoyaltyRedemptionDto>(); }
+            }
+            catch { return Enumerable.Empty<LoyaltyRedemptionDto>(); }
+        }
+
+        public async Task<IEnumerable<LoyaltyRedemptionDto>> GetMyPendingRedemptionsAsync()
+        {
+            try
+            {
+                return await _httpClient.GetFromJsonAsync<IEnumerable<LoyaltyRedemptionDto>>("api/Loyalty/my-pending-redemptions") ?? Enumerable.Empty<LoyaltyRedemptionDto>();
+            }
+            catch { return Enumerable.Empty<LoyaltyRedemptionDto>(); }
+        }
+
+        public async Task<IEnumerable<PointHistoryEntryDto>> GetPointsHistoryAsync(string accountId)
+        {
+            try
+            {
+                var options = new JsonSerializerOptions { PropertyNameCaseInsensitive = true };
+                var response = await _httpClient.GetAsync($"api/v1/accounts/{accountId}/history");
+                if (response.IsSuccessStatusCode)
+                    return await response.Content.ReadFromJsonAsync<IEnumerable<PointHistoryEntryDto>>(options) ?? Enumerable.Empty<PointHistoryEntryDto>();
+                return Enumerable.Empty<PointHistoryEntryDto>();
+            }
+            catch { return Enumerable.Empty<PointHistoryEntryDto>(); }
+        }
+
+        public async Task<IEnumerable<UserPointsHistoryDto>> GetAllMembersPointsHistoryAsync()
+        {
+            try {
+                var options = new JsonSerializerOptions { PropertyNameCaseInsensitive = true };
+                var response = await _httpClient.GetAsync("api/Loyalty/admin/all-points-history");
+                var raw = await response.Content.ReadAsStringAsync();
+                if (!response.IsSuccessStatusCode)
+                    return Enumerable.Empty<UserPointsHistoryDto>();
+
+                var data = JsonSerializer.Deserialize<List<UserPointsHistoryDto>>(raw, options) ?? new List<UserPointsHistoryDto>();
+                foreach (var member in data)
+                {
+                    member.History = member.History?.ToList() ?? new List<PointHistoryEntryDto>();
+                    member.Redemptions = member.Redemptions?.ToList() ?? new List<LoyaltyRedemptionDto>();
+                }
+                return data;
+            } catch { return Enumerable.Empty<UserPointsHistoryDto>(); }
         }
 
         public async Task<bool> RequestReturnAsync(Guid borrowingId)
@@ -220,7 +272,7 @@ namespace Frontend.Services
             {
                 var request = new ClaimRewardRequestDto { RewardId = rewardId, Notes = notes };
                 var response = await _httpClient.PostAsJsonAsync("api/Loyalty/claim", request);
-                
+
                 if (response.IsSuccessStatusCode)
                 {
                     var result = await response.Content.ReadFromJsonAsync<JsonDocument>();
@@ -250,7 +302,8 @@ namespace Frontend.Services
 
         public async Task<IEnumerable<LoyaltyRewardDto>> GetActiveRewardsAsync()
         {
-            try {
+            try
+            {
                 // Fetch from the external loyalty API directly or via our backend proxy
                 // The user specified the URL: http://150.95.88.91:4100/api/v1/rewards/active/THS-LMS
                 // We'll use a new HttpClient or just the existing one if configured correctly.
@@ -260,7 +313,8 @@ namespace Frontend.Services
                 // In ASP.NET Core MVC, the server-side HttpClient can call it directly.
                 var client = new HttpClient();
                 return await client.GetFromJsonAsync<IEnumerable<LoyaltyRewardDto>>("http://150.95.88.91:4100/api/v1/rewards/active/THS-LMS") ?? Enumerable.Empty<LoyaltyRewardDto>();
-            } catch { return Enumerable.Empty<LoyaltyRewardDto>(); }
+            }
+            catch { return Enumerable.Empty<LoyaltyRewardDto>(); }
         }
 
         #region Users
@@ -300,7 +354,8 @@ namespace Frontend.Services
         #endregion
         public async Task<IEnumerable<LoyaltyRedemptionDto>> GetPendingRedemptionsAsync()
         {
-            try {
+            try
+            {
                 var response = await _httpClient.GetAsync("api/Loyalty/admin/redemptions/pending");
                 if (response.IsSuccessStatusCode)
                 {
@@ -308,12 +363,14 @@ namespace Frontend.Services
                     return await response.Content.ReadFromJsonAsync<IEnumerable<LoyaltyRedemptionDto>>(options) ?? Enumerable.Empty<LoyaltyRedemptionDto>();
                 }
                 return Enumerable.Empty<LoyaltyRedemptionDto>();
-            } catch { return Enumerable.Empty<LoyaltyRedemptionDto>(); }
+            }
+            catch { return Enumerable.Empty<LoyaltyRedemptionDto>(); }
         }
 
         public async Task<(bool Success, string Message)> FulfillRedemptionAsync(string id)
         {
-            try {
+            try
+            {
                 var response = await _httpClient.PostAsync($"api/Loyalty/admin/redemptions/{id}/fulfill", null);
                 if (response.IsSuccessStatusCode)
                 {
@@ -335,7 +392,8 @@ namespace Frontend.Services
                     }
                     return (false, msg);
                 }
-            } catch (Exception ex) { return (false, $"Error: {ex.Message}"); }
+            }
+            catch (Exception ex) { return (false, $"Error: {ex.Message}"); }
         }
     }
 }

Frontend/Views/Rewards/Index.cshtml

@@ -0,0 +1,264 @@
+@model Frontend.Models.RewardsViewModel
+@{
+    ViewData["Title"] = "My Rewards";
+    var hasAccount = Model.Account != null;
+    var redemptionById = Model.RedemptionsHistory
+        .Where(r => !string.IsNullOrWhiteSpace(r.Id))
+        .GroupBy(r => r.Id)
+        .ToDictionary(g => g.Key, g => g.First());
+
+    string PrettyEvent(string? eventKey, double points)
+    {
+        var key = (eventKey ?? string.Empty).Trim().ToUpperInvariant();
+
+        return key switch
+        {
+            "RETURN" or "BOOK_RETURN" or "BORROW_RETURN" => "RETURN",
+            "SIGNUP" or "REGISTER" => "SIGNUP",
+            "SUBSCRIBE" or "SUBSCRIPTION" or "MEMBERSHIP" => "SUBSCRIBE",
+            "REDEEM" or "REDEMPTION" or "CLAIM_REWARD" => "REDEEM",
+            _ => points < 0 ? "SPENT" : (string.IsNullOrEmpty(key) ? "EARNED" : key)
+        };
+    }
+}
+
+<div class="mb-8 flex flex-col md:flex-row md:items-center justify-between gap-6">
+    <div>
+        <h1 class="text-3xl font-extrabold tracking-tight text-slate-900">Loyalty Rewards</h1>
+        <p class="text-slate-500 mt-1">Earn points, redeem rewards, and track your loyalty journey.</p>
+    </div>
+    @if (hasAccount)
+    {
+        <div class="flex items-center gap-4">
+            <div class="text-center bg-amber-50 border border-amber-200 px-6 py-3 rounded-2xl shadow-sm">
+                <p class="text-[10px] font-bold text-amber-600 uppercase tracking-widest">Balance</p>
+                <p class="text-2xl font-black text-slate-900">@Model.Account!.CurrentBalance.ToString("N0")</p>
+                <p class="text-xs text-amber-600 font-semibold">Points</p>
+            </div>
+            <div class="text-center bg-slate-50 border border-slate-200 px-6 py-3 rounded-2xl shadow-sm">
+                <p class="text-[10px] font-bold text-slate-500 uppercase tracking-widest">Tier</p>
+                <p class="text-lg font-black text-slate-900">@Model.Account!.Tier</p>
+            </div>
+        </div>
+    }
+</div>
+
+<div class="mb-6 border-b border-slate-200">
+    <nav class="-mb-px flex gap-6">
+        <button onclick="switchTab('tab-redeem','btn-redeem')" id="btn-redeem"
+                class="tab-btn pb-3 text-sm font-semibold border-b-2 border-slate-900 text-slate-900 transition-all">
+            <span class="inline-flex items-center gap-1.5">
+                <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M20 12v7a2 2 0 01-2 2H6a2 2 0 01-2-2v-7m16 0H4m16 0l-2.586-2.586a2 2 0 00-2.828 0L12 12m0 0L9.414 9.414a2 2 0 00-2.828 0L4 12m8 0V5" />
+                </svg>
+                Available Rewards
+            </span>
+        </button>
+        <button onclick="switchTab('tab-pending','btn-pending')" id="btn-pending"
+                class="tab-btn pb-3 text-sm font-semibold border-b-2 border-transparent text-slate-400 hover:text-slate-700 transition-all">
+            <span class="inline-flex items-center gap-1.5">
+                <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 8v4l3 3m6-3a9 9 0 11-18 0 9 9 0 0118 0z" />
+                </svg>
+                Pending
+            </span>
+            @if (Model.PendingRedemptions.Any())
+            {
+                <span class="ml-1 inline-flex items-center justify-center w-5 h-5 text-[10px] font-black rounded-full bg-amber-400 text-slate-900">@Model.PendingRedemptions.Count()</span>
+            }
+        </button>
+        <button onclick="switchTab('tab-history','btn-history')" id="btn-history"
+                class="tab-btn pb-3 text-sm font-semibold border-b-2 border-transparent text-slate-400 hover:text-slate-700 transition-all">
+            <span class="inline-flex items-center gap-1.5">
+                <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 17v-6m4 6V7m4 10v-3M5 21h14a2 2 0 002-2V5a2 2 0 00-2-2H5a2 2 0 00-2 2v14a2 2 0 002 2z" />
+                </svg>
+                Points History
+            </span>
+        </button>
+    </nav>
+</div>
+
+<!-- Available Rewards Tab -->
+<div id="tab-redeem" class="tab-content">
+    @if (!Model.Rewards.Any())
+    {
+        <div class="py-20 text-center bg-slate-50 rounded-3xl border-2 border-dashed border-slate-200">
+            <p class="text-slate-400 font-medium">No active rewards available. Check back soon!</p>
+        </div>
+    }
+    else
+    {
+        <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
+            @foreach (var reward in Model.Rewards)
+            {
+                var canAfford = hasAccount && Model.Account!.CurrentBalance >= reward.PointCost;
+                <div class="group relative bg-white border border-slate-200 rounded-2xl shadow-sm hover:shadow-xl hover:-translate-y-1 transition-all duration-300 overflow-hidden">
+                    <div class="h-1.5 @(canAfford ? "bg-gradient-to-r from-amber-400 to-orange-400" : "bg-slate-200")"></div>
+                    <div class="p-6">
+                        <div class="flex justify-between items-start mb-4">
+                            <div class="p-3 @(canAfford ? "bg-amber-50 text-amber-600" : "bg-slate-100 text-slate-400") rounded-xl">
+                                <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 3v4M3 5h4M6 17v4m-2-2h4m5-16l2.286 6.857L21 12l-5.714 2.143L13 21l-2.286-6.857L5 12l5.714-2.143L13 3z"></path></svg>
+                            </div>
+                            <div class="text-right">
+                                <span class="text-2xl font-black text-slate-900">@reward.PointCost.ToString("N0")</span>
+                                <span class="text-[10px] block font-bold text-slate-400 uppercase">pts required</span>
+                            </div>
+                        </div>
+                        <h3 class="text-base font-bold text-slate-900 mb-1 truncate">@reward.Name</h3>
+                        <p class="text-sm text-slate-500 mb-5 line-clamp-2 h-10">@reward.Description</p>
+                        <div class="flex items-center justify-between pt-4 border-t border-slate-100">
+                            <span class="text-xs font-semibold text-slate-500">@reward.StockQuantity in stock</span>
+                            @if (canAfford)
+                            {
+                                <button onclick="redeemReward('@reward.Id','@reward.Name',@reward.PointCost)"
+                                        class="bg-slate-900 text-white px-4 py-2 rounded-xl text-xs font-bold hover:bg-amber-500 transition-all active:scale-95">
+                                    Redeem
+                                </button>
+                            }
+                            else
+                            {
+                                <span class="text-xs font-bold text-slate-400 bg-slate-100 px-3 py-2 rounded-xl">Need more pts</span>
+                            }
+                        </div>
+                    </div>
+                    @if (reward.StockQuantity < 10)
+                    {
+                        <span class="absolute top-3 right-3 animate-pulse bg-rose-500 text-white text-[9px] font-black px-2 py-0.5 rounded-full uppercase">Limited</span>
+                    }
+                </div>
+            }
+        </div>
+    }
+    <div class="mt-8 p-7 bg-slate-900 rounded-3xl text-white flex flex-col md:flex-row items-center justify-between gap-5">
+        <div>
+            <h2 class="text-lg font-bold mb-1">How to earn more points?</h2>
+            <p class="text-slate-400 text-sm">Borrow books, subscribe, and return on time to earn points!</p>
+        </div>
+        <a asp-controller="Books" asp-action="Index" class="bg-amber-400 text-slate-900 px-6 py-3 rounded-2xl font-black hover:bg-amber-300 transition-all text-sm whitespace-nowrap">Browse Books →</a>
+    </div>
+</div>
+
+<!-- Pending Redemptions Tab -->
+<div id="tab-pending" class="tab-content hidden">
+    @if (!Model.PendingRedemptions.Any())
+    {
+        <div class="py-20 text-center bg-slate-50 rounded-3xl border-2 border-dashed border-slate-200">
+            <p class="text-slate-400 font-medium">No pending redemptions — you're all clear!</p>
+        </div>
+    }
+    else
+    {
+        <div class="space-y-3">
+            @foreach (var r in Model.PendingRedemptions)
+            {
+                <div class="flex items-center justify-between bg-white border border-amber-100 rounded-2xl px-6 py-4 shadow-sm">
+                    <div class="flex items-center gap-4">
+                        <div class="w-10 h-10 rounded-xl bg-amber-50 flex items-center justify-center text-amber-500 flex-shrink-0">
+                            <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 8v13m0-13V6a2 2 0 112 2h-2zm0 0V5.5A2.5 2.5 0 109.5 8H12zm-7 4h14M5 12a2 2 0 110-4h14a2 2 0 110 4M5 12v7a2 2 0 002 2h10a2 2 0 002-2v-7"></path></svg>
+                        </div>
+                        <div>
+                            <p class="font-bold text-slate-900 text-sm">@r.RewardName</p>
+                            <p class="text-xs text-slate-400">Claimed @r.RedeemedAt.ToString("MMM dd, yyyy") · @r.PointCost.ToString("N0") pts</p>
+                        </div>
+                    </div>
+                    <span class="inline-flex items-center gap-1.5 px-3 py-1 rounded-full text-xs font-bold bg-amber-100 text-amber-700">
+                        <span class="w-1.5 h-1.5 rounded-full bg-amber-500 animate-pulse"></span>
+                        Awaiting Fulfillment
+                    </span>
+                </div>
+            }
+        </div>
+    }
+</div>
+
+<!-- Points History Tab -->
+<div id="tab-history" class="tab-content hidden">
+    @if (!Model.PointsHistory.Any())
+    {
+        <div class="py-20 text-center bg-slate-50 rounded-3xl border-2 border-dashed border-slate-200">
+            <p class="text-slate-400 font-medium">No points history yet. Start borrowing books to earn points!</p>
+        </div>
+    }
+    else
+    {
+        <div class="bg-white border border-slate-200 rounded-2xl overflow-hidden shadow-sm">
+            <table class="min-w-full divide-y divide-slate-100">
+                <thead class="bg-slate-50">
+                    <tr>
+                        <th class="px-6 py-3 text-left text-xs font-bold text-slate-500 uppercase tracking-wider">Date</th>
+                        <th class="px-6 py-3 text-left text-xs font-bold text-slate-500 uppercase tracking-wider">Type</th>
+                        <th class="px-6 py-3 text-left text-xs font-bold text-slate-500 uppercase tracking-wider">Details</th>
+                        <th class="px-6 py-3 text-left text-xs font-bold text-slate-500 uppercase tracking-wider">Spent on</th>
+                        <th class="px-6 py-3 text-right text-xs font-bold text-slate-500 uppercase tracking-wider">Points</th>
+                    </tr>
+                </thead>
+                <tbody class="divide-y divide-slate-50">
+                    @foreach (var h in Model.PointsHistory.OrderByDescending(x => x.CreatedAt))
+                    {
+                        var isPos = h.PointDelta >= 0;
+                        var label = PrettyEvent(h.EventKey, h.PointDelta);
+                        string? spentOn = null;
+                        if (!isPos && !string.IsNullOrWhiteSpace(h.RewardName))
+                        {
+                            spentOn = h.RewardName;
+                        }
+                        else if (!isPos && !string.IsNullOrWhiteSpace(h.ReferenceId) && redemptionById.TryGetValue(h.ReferenceId, out var redemption))
+                        {
+                            spentOn = redemption.RewardName;
+                        }
+                        <tr class="hover:bg-slate-50 transition-colors">
+                            <td class="px-6 py-3 text-sm text-slate-500 whitespace-nowrap">@h.CreatedAt.ToString("MMM dd, yyyy")</td>
+                            <td class="px-6 py-3">
+                                <span class="px-2.5 py-0.5 rounded-full text-xs font-bold @(isPos ? "bg-emerald-100 text-emerald-700" : "bg-rose-100 text-rose-700")">@label</span>
+                            </td>
+                            <td class="px-6 py-3 text-sm text-slate-600 max-w-xs truncate">@h.Description</td>
+                            <td class="px-6 py-3 text-sm text-slate-600 max-w-xs truncate">
+                                @if (!string.IsNullOrWhiteSpace(spentOn))
+                                {
+                                    <span class="font-semibold text-slate-700">@spentOn</span>
+                                }
+                                else
+                                {
+                                    <span class="text-slate-400">—</span>
+                                }
+                            </td>
+                            <td class="px-6 py-3 text-right font-black text-base @(isPos ? "text-emerald-600" : "text-rose-600")">
+                                @(isPos ? "+" : "")@h.PointDelta.ToString("N0")
+                            </td>
+                        </tr>
+                    }
+                </tbody>
+            </table>
+        </div>
+    }
+</div>
+
+@section Scripts {
+    <script>
+        function switchTab(tabId, btnId) {
+            document.querySelectorAll('.tab-content').forEach(t => t.classList.add('hidden'));
+            document.getElementById(tabId).classList.remove('hidden');
+            document.querySelectorAll('.tab-btn').forEach(b => {
+                b.classList.remove('border-slate-900','text-slate-900');
+                b.classList.add('border-transparent','text-slate-400');
+            });
+            const btn = document.getElementById(btnId);
+            btn.classList.remove('border-transparent','text-slate-400');
+            btn.classList.add('border-slate-900','text-slate-900');
+        }
+        async function redeemReward(rewardId, rewardName, cost) {
+            if (!confirm(`Redeem "${rewardName}" for ${cost.toLocaleString()} points?`)) return;
+            try {
+                const r = await fetch('/Rewards/Redeem', {
+                    method: 'POST',
+                    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+                    body: new URLSearchParams({ rewardId })
+                });
+                const res = await r.json();
+                if (res.success) { showToast(res.message, 'success'); setTimeout(() => location.reload(), 1500); }
+                else showToast('Error: ' + res.message, 'error');
+            } catch { showToast('Unexpected error.', 'error'); }
+        }
+    </script>
+}

Frontend/Views/Rewards/Manage.cshtml

@@ -0,0 +1,287 @@
+@model Frontend.Models.LibrarianRewardsViewModel
+@{
+    ViewData["Title"] = "Rewards Management";
+
+    string PrettyEvent(string? eventKey, double points)
+    {
+        var key = (eventKey ?? string.Empty).Trim().ToUpperInvariant();
+
+        return key switch
+        {
+            "RETURN" or "BOOK_RETURN" or "BORROW_RETURN" => "RETURN",
+            "SIGNUP" or "REGISTER" => "SIGNUP",
+            "SUBSCRIBE" or "SUBSCRIPTION" or "MEMBERSHIP" => "SUBSCRIBE",
+            "REDEEM" or "REDEMPTION" or "CLAIM_REWARD" => "REDEEM",
+            _ => points < 0 ? "SPENT" : (string.IsNullOrEmpty(key) ? "EARNED" : key)
+        };
+    }
+}
+
+<div class="mb-8 flex flex-col md:flex-row md:items-center justify-between gap-4">
+    <div>
+        <h1 class="text-3xl font-extrabold tracking-tight text-slate-900">Rewards Management</h1>
+        <p class="text-slate-500 mt-1">Fulfill pending redemptions and review all members' loyalty activity.</p>
+    </div>
+    <div class="flex items-center gap-4">
+        <div class="bg-amber-50 border border-amber-200 px-5 py-2.5 rounded-xl text-center shadow-sm">
+            <p class="text-[10px] font-bold text-amber-600 uppercase tracking-widest">Pending</p>
+            <p class="text-2xl font-black text-slate-900">@Model.PendingRedemptions.Count()</p>
+        </div>
+        <div class="bg-slate-50 border border-slate-200 px-5 py-2.5 rounded-xl text-center shadow-sm">
+            <p class="text-[10px] font-bold text-slate-500 uppercase tracking-widest">Members w/ History</p>
+            <p class="text-2xl font-black text-slate-900">@Model.AllMembersHistory.Count()</p>
+        </div>
+    </div>
+</div>
+
+<!-- Tabs -->
+<div class="mb-6 border-b border-slate-200">
+    <nav class="-mb-px flex gap-6">
+        <button onclick="switchTab('tab-pending','btn-pending')" id="btn-pending"
+                class="tab-btn pb-3 text-sm font-semibold border-b-2 border-slate-900 text-slate-900 transition-all">
+            <span class="inline-flex items-center gap-1.5">
+                <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 8v4l3 3m6-3a9 9 0 11-18 0 9 9 0 0118 0z" />
+                </svg>
+                Pending Redemptions
+            </span>
+            @if (Model.PendingRedemptions.Any())
+            {
+                <span class="ml-1 inline-flex items-center justify-center min-w-[20px] h-5 px-1.5 text-[10px] font-black rounded-full bg-rose-500 text-white">@Model.PendingRedemptions.Count()</span>
+            }
+        </button>
+        <button onclick="switchTab('tab-history','btn-history')" id="btn-history"
+                class="tab-btn pb-3 text-sm font-semibold border-b-2 border-transparent text-slate-400 hover:text-slate-700 transition-all">
+            <span class="inline-flex items-center gap-1.5">
+                <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 17v-6m4 6V7m4 10v-3M5 21h14a2 2 0 002-2V5a2 2 0 00-2-2H5a2 2 0 00-2 2v14a2 2 0 002 2z" />
+                </svg>
+                All Members' Points History
+            </span>
+        </button>
+    </nav>
+</div>
+
+<!-- Pending Redemptions Tab -->
+<div id="tab-pending" class="tab-content">
+    @if (!Model.PendingRedemptions.Any())
+    {
+        <div class="py-20 text-center bg-slate-50 rounded-3xl border-2 border-dashed border-slate-200">
+            <svg class="w-16 h-16 mx-auto opacity-20 text-slate-400 mb-3" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z"></path></svg>
+            <p class="text-slate-500 font-medium">No pending redemptions. All caught up!</p>
+        </div>
+    }
+    else
+    {
+        <div class="bg-white border border-slate-200 rounded-2xl overflow-hidden shadow-sm">
+            <table class="min-w-full divide-y divide-slate-100">
+                <thead class="bg-slate-50">
+                    <tr>
+                        <th class="px-6 py-3 text-left text-xs font-bold text-slate-500 uppercase tracking-wider">Member</th>
+                        <th class="px-6 py-3 text-left text-xs font-bold text-slate-500 uppercase tracking-wider">Reward</th>
+                        <th class="px-6 py-3 text-left text-xs font-bold text-slate-500 uppercase tracking-wider">Points</th>
+                        <th class="px-6 py-3 text-left text-xs font-bold text-slate-500 uppercase tracking-wider">Claimed</th>
+                        <th class="px-6 py-3 text-left text-xs font-bold text-slate-500 uppercase tracking-wider">Status</th>
+                        <th class="px-6 py-3 text-right text-xs font-bold text-slate-500 uppercase tracking-wider">Action</th>
+                    </tr>
+                </thead>
+                <tbody class="divide-y divide-slate-100">
+                    @foreach (var r in Model.PendingRedemptions.OrderBy(x => x.RedeemedAt))
+                    {
+                        <tr class="hover:bg-amber-50/40 transition-colors" id="row-@r.Id">
+                            <td class="px-6 py-4">
+                                <div class="flex items-center gap-3">
+                                    <div class="w-8 h-8 rounded-full bg-slate-900 flex items-center justify-center text-white text-xs font-bold flex-shrink-0">
+                                        @(r.ExternalUserId.Length >= 2 ? r.ExternalUserId.Substring(0, 2).ToUpper() : "U")
+                                    </div>
+                                    <span class="text-sm font-medium text-slate-700 font-mono text-xs">@r.ExternalUserId</span>
+                                </div>
+                            </td>
+                            <td class="px-6 py-4">
+                                <p class="text-sm font-bold text-slate-900">@r.RewardName</p>
+                                <p class="text-xs text-slate-400">ID: @r.Id[..Math.Min(8, r.Id.Length)]...</p>
+                            </td>
+                            <td class="px-6 py-4 text-sm font-bold text-slate-700">@r.PointCost.ToString("N0") pts</td>
+                            <td class="px-6 py-4 text-sm text-slate-500 whitespace-nowrap">@r.RedeemedAt.ToString("MMM dd, yyyy")</td>
+                            <td class="px-6 py-4">
+                                <span class="inline-flex items-center gap-1.5 px-2.5 py-1 rounded-full text-xs font-bold bg-amber-100 text-amber-700">
+                                    <span class="w-1.5 h-1.5 rounded-full bg-amber-500 animate-pulse"></span>
+                                    Pending
+                                </span>
+                            </td>
+                            <td class="px-6 py-4 text-right">
+                                <button onclick="fulfillRedemption('@r.Id')"
+                                        class="inline-flex items-center gap-1.5 bg-emerald-600 text-white px-4 py-2 rounded-xl text-xs font-bold hover:bg-emerald-700 transition-all active:scale-95">
+                                    <svg class="w-3.5 h-3.5" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5" d="M5 13l4 4L19 7"></path></svg>
+                                    Fulfill
+                                </button>
+                            </td>
+                        </tr>
+                    }
+                </tbody>
+            </table>
+        </div>
+    }
+</div>
+
+<!-- All Members Points History Tab -->
+<div id="tab-history" class="tab-content hidden">
+    @if (!Model.AllMembersHistory.Any())
+    {
+        <div class="py-20 text-center bg-slate-50 rounded-3xl border-2 border-dashed border-slate-200">
+            <p class="text-slate-400 font-medium">No loyalty history found for any members yet.</p>
+        </div>
+    }
+    else
+    {
+        <!-- Search/filter bar -->
+        <div class="mb-4">
+            <input id="member-search" type="text" placeholder="Filter by member name or email..."
+                   class="w-full max-w-sm px-4 py-2.5 border border-slate-200 rounded-xl text-sm focus:outline-none focus:ring-2 focus:ring-slate-900 bg-white"
+                   oninput="filterMembers(this.value)" />
+        </div>
+
+        <div class="space-y-4" id="members-list">
+            @foreach (var member in Model.AllMembersHistory.OrderByDescending(m => m.CurrentBalance))
+            {
+                <div class="member-card bg-white border border-slate-200 rounded-2xl overflow-hidden shadow-sm"
+                     data-name="@member.UserName.ToLower()" data-email="@member.UserEmail.ToLower()">
+                    @{
+                        var redemptionById = member.Redemptions
+                            .Where(r => !string.IsNullOrWhiteSpace(r.Id))
+                            .GroupBy(r => r.Id)
+                            .ToDictionary(g => g.Key, g => g.First());
+                    }
+                    <!-- Member header -->
+                    <div class="flex items-center justify-between px-6 py-4 bg-slate-50 border-b border-slate-100 cursor-pointer"
+                         onclick="toggleHistory('@member.AccountId')">
+                        <div class="flex items-center gap-4">
+                            <div class="w-10 h-10 rounded-full bg-slate-900 flex items-center justify-center text-white font-bold text-sm flex-shrink-0">
+                                @(member.UserName.Length >= 2 ? member.UserName.Substring(0, 2).ToUpper() : "?")
+                            </div>
+                            <div>
+                                <p class="font-bold text-slate-900 text-sm">@member.UserName</p>
+                                <p class="text-xs text-slate-400">@member.UserEmail</p>
+                            </div>
+                        </div>
+                        <div class="flex items-center gap-6">
+                            <div class="text-right">
+                                <p class="text-xs font-bold text-slate-400 uppercase tracking-widest">Balance</p>
+                                <p class="font-black text-slate-900">@member.CurrentBalance.ToString("N0") pts</p>
+                            </div>
+                            <div class="text-right">
+                                <p class="text-xs font-bold text-slate-400 uppercase tracking-widest">Tier</p>
+                                <span class="text-xs font-bold px-2 py-0.5 rounded-full bg-slate-200 text-slate-700">@member.Tier</span>
+                            </div>
+                            <div class="text-right">
+                                <p class="text-xs font-bold text-slate-400 uppercase tracking-widest">Transactions</p>
+                                <p class="font-black text-slate-900">@member.History.Count()</p>
+                            </div>
+                            <svg class="w-4 h-4 text-slate-400 transition-transform" id="arrow-@member.AccountId" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7"></path></svg>
+                        </div>
+                    </div>
+                    <!-- Collapsible history table -->
+                    <div id="history-@member.AccountId" class="hidden overflow-x-auto">
+                        @if (!member.History.Any())
+                        {
+                            <p class="px-6 py-4 text-sm text-slate-400 italic">No transactions found for this member.</p>
+                        }
+                        else
+                        {
+                            <table class="min-w-full divide-y divide-slate-50">
+                                <thead>
+                                    <tr class="bg-slate-50/50">
+                                        <th class="px-6 py-2 text-left text-[10px] font-bold text-slate-400 uppercase tracking-wider">Date</th>
+                                        <th class="px-6 py-2 text-left text-[10px] font-bold text-slate-400 uppercase tracking-wider">Type</th>
+                                        <th class="px-6 py-2 text-left text-[10px] font-bold text-slate-400 uppercase tracking-wider">Details</th>
+                                        <th class="px-6 py-2 text-left text-[10px] font-bold text-slate-400 uppercase tracking-wider">Spent on</th>
+                                        <th class="px-6 py-2 text-right text-[10px] font-bold text-slate-400 uppercase tracking-wider">Points</th>
+                                    </tr>
+                                </thead>
+                                <tbody class="divide-y divide-slate-50">
+                                    @foreach (var h in member.History.OrderByDescending(x => x.CreatedAt))
+                                    {
+                                        var isPos = h.PointDelta >= 0;
+                                        var label = PrettyEvent(h.EventKey, h.PointDelta);
+                                        string? spentOn = null;
+                                        if (!isPos && !string.IsNullOrWhiteSpace(h.RewardName))
+                                        {
+                                            spentOn = h.RewardName;
+                                        }
+                                        else if (!isPos && !string.IsNullOrWhiteSpace(h.ReferenceId) && redemptionById.TryGetValue(h.ReferenceId, out var redemption))
+                                        {
+                                            spentOn = redemption.RewardName;
+                                        }
+                                        <tr class="hover:bg-slate-50 transition-colors">
+                                            <td class="px-6 py-2.5 text-xs text-slate-500 whitespace-nowrap">@h.CreatedAt.ToString("MMM dd, yyyy")</td>
+                                            <td class="px-6 py-2.5">
+                                                <span class="px-2 py-0.5 rounded-full text-[10px] font-bold @(isPos ? "bg-emerald-100 text-emerald-700" : "bg-rose-100 text-rose-700")">@label</span>
+                                            </td>
+                                            <td class="px-6 py-2.5 text-xs text-slate-600 max-w-xs truncate">@h.Description</td>
+                                            <td class="px-6 py-2.5 text-xs text-slate-600 max-w-xs truncate">
+                                                @if (!string.IsNullOrWhiteSpace(spentOn))
+                                                {
+                                                    <span class="font-semibold text-slate-700">@spentOn</span>
+                                                }
+                                                else
+                                                {
+                                                    <span class="text-slate-400">—</span>
+                                                }
+                                            </td>
+                                            <td class="px-6 py-2.5 text-right font-black text-sm @(isPos ? "text-emerald-600" : "text-rose-600")">
+                                                @(isPos ? "+" : "")@h.PointDelta.ToString("N0")
+                                            </td>
+                                        </tr>
+                                    }
+                                </tbody>
+                            </table>
+                        }
+                    </div>
+                </div>
+            }
+        </div>
+    }
+</div>
+
+<!-- Hidden form for fulfillment -->
+<form id="fulfill-form" asp-controller="Rewards" asp-action="Fulfill" method="post" class="hidden">
+    <input type="hidden" name="id" id="fulfill-id" />
+</form>
+
+@section Scripts {
+    <script>
+        function switchTab(tabId, btnId) {
+            document.querySelectorAll('.tab-content').forEach(t => t.classList.add('hidden'));
+            document.getElementById(tabId).classList.remove('hidden');
+            document.querySelectorAll('.tab-btn').forEach(b => {
+                b.classList.remove('border-slate-900','text-slate-900');
+                b.classList.add('border-transparent','text-slate-400');
+            });
+            const btn = document.getElementById(btnId);
+            btn.classList.remove('border-transparent','text-slate-400');
+            btn.classList.add('border-slate-900','text-slate-900');
+        }
+
+        function toggleHistory(accountId) {
+            const panel = document.getElementById('history-' + accountId);
+            const arrow = document.getElementById('arrow-' + accountId);
+            panel.classList.toggle('hidden');
+            arrow.classList.toggle('rotate-180');
+        }
+
+        function filterMembers(query) {
+            const q = query.toLowerCase();
+            document.querySelectorAll('.member-card').forEach(card => {
+                const name = card.dataset.name || '';
+                const email = card.dataset.email || '';
+                card.style.display = (name.includes(q) || email.includes(q)) ? '' : 'none';
+            });
+        }
+
+        function fulfillRedemption(id) {
+            if (!confirm('Fulfill this redemption and grant membership to the member?')) return;
+            document.getElementById('fulfill-id').value = id;
+            document.getElementById('fulfill-form').submit();
+        }
+    </script>
+}

Frontend/Views/Shared/_Layout.cshtml

@@ -88,6 +88,11 @@
                                 <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="flex-shrink-0 mr-3"><rect width="20" height="14" x="2" y="5" rx="2"/><line x1="2" x2="22" y1="10" y2="10"/></svg>
                                 My Membership
                             </a>
+
+                            <a asp-controller="Rewards" asp-action="Index" class="nav-link @(ViewContext.RouteData.Values["Controller"]?.ToString() == "Rewards" ? "nav-link-active" : "nav-link-inactive")">
+                                <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="flex-shrink-0 mr-3"><path d="M20 7h-9"/><path d="M14 17H5"/><circle cx="17" cy="17" r="3"/><circle cx="7" cy="7" r="3"/></svg>
+                                Rewards
+                            </a>
                         }
                         @if (User.Identity?.IsAuthenticated == true && User.IsInRole("Librarian"))
                         {
@@ -101,7 +106,7 @@
                                 Manage Borrowings
                             </a>
 
-                            <a asp-controller="Subscriptions" asp-action="Rewards" class="nav-link @(ViewContext.RouteData.Values["Controller"]?.ToString() == "Subscriptions" && ViewContext.RouteData.Values["Action"]?.ToString() == "Rewards" ? "nav-link-active" : "nav-link-inactive")">
+                            <a asp-controller="Rewards" asp-action="Manage" class="nav-link @(ViewContext.RouteData.Values["Controller"]?.ToString() == "Rewards" ? "nav-link-active" : "nav-link-inactive")">
                                 <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="flex-shrink-0 mr-3"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg>
                                 Rewards
                             </a>
@@ -224,3 +229,4 @@
     @await RenderSectionAsync("Scripts", required: false)
 </body>
 </html>
+<!-- test -->