From 2b6e2e1c4dbb0d8aa8f4a5b1ba14663ceed61b05 Mon Sep 17 00:00:00 2001 From: Mathias Date: Mon, 18 Nov 2024 19:18:11 +0100 Subject: [PATCH 01/19] Add admin pages for managing reviews, user libraries, and user favorites **Create Review** * Add a form to create a new review with fields for `GameId`, `UserId`, `Rating`, and `Content` * Add a submit button to save the review **Edit Review** * Add a form to edit an existing review with fields for `GameId`, `UserId`, `Rating`, and `Content` * Add a submit button to save the changes **Delete Review** * Add a confirmation page to delete a review * Display the review details and a delete button **List Reviews** * Add a table to list all reviews with columns for `GameId`, `UserId`, `Rating`, and `Content` * Add links to edit and delete each review **Create User Library Entry** * Add a form to create a new user library entry with fields for `UserId`, `GameId`, `Status`, and `IsUpcoming` * Add a submit button to save the entry **Edit User Library Entry** * Add a form to edit an existing user library entry with fields for `UserId`, `GameId`, `Status`, and `IsUpcoming` * Add a submit button to save the changes **Delete User Library Entry** * Add a confirmation page to delete a user library entry * Display the entry details and a delete button **List User Library Entries** * Add a table to list all user library entries with columns for `UserId`, `GameId`, `Status`, and `IsUpcoming` * Add links to edit and delete each entry **Create User Favorite Entry** * Add a form to create a new user favorite entry with fields for `UserId` and `GameId` * Add a submit button to save the entry --- GameLibrary/Pages/Admin/Dashboard.cshtml | 108 ++++++++++++++++++ GameLibrary/Pages/Admin/Dashboard.cshtml.cs | 44 +++++++ GameLibrary/Pages/Admin/Index.cshtml | 18 +++ GameLibrary/Pages/Admin/Index.cshtml.cs | 34 ++++++ GameLibrary/Pages/Admin/Reviews/Create.cshtml | 55 +++++++++ .../Pages/Admin/Reviews/Create.cshtml.cs | 42 +++++++ GameLibrary/Pages/Admin/Reviews/Delete.cshtml | 53 +++++++++ .../Pages/Admin/Reviews/Delete.cshtml.cs | 54 +++++++++ GameLibrary/Pages/Admin/Reviews/Edit.cshtml | 56 +++++++++ .../Pages/Admin/Reviews/Edit.cshtml.cs | 71 ++++++++++++ GameLibrary/Pages/Admin/Reviews/Index.cshtml | 46 ++++++++ .../Pages/Admin/Reviews/Index.cshtml.cs | 26 +++++ GameLibrary/Pages/Admin/Roles/Create.cshtml | 20 ++++ .../Pages/Admin/Roles/Create.cshtml.cs | 37 ++++++ GameLibrary/Pages/Admin/Roles/Delete.cshtml | 29 +++++ .../Pages/Admin/Roles/Delete.cshtml.cs | 54 +++++++++ GameLibrary/Pages/Admin/Roles/Edit.cshtml | 20 ++++ GameLibrary/Pages/Admin/Roles/Edit.cshtml.cs | 68 +++++++++++ GameLibrary/Pages/Admin/Roles/Index.cshtml | 33 ++++++ GameLibrary/Pages/Admin/Roles/Index.cshtml.cs | 23 ++++ .../Pages/Admin/UserFavorites/Create.cshtml | 43 +++++++ .../Admin/UserFavorites/Create.cshtml.cs | 42 +++++++ .../Pages/Admin/UserFavorites/Delete.cshtml | 42 +++++++ .../Admin/UserFavorites/Delete.cshtml.cs | 57 +++++++++ .../Pages/Admin/UserFavorites/Edit.cshtml | 44 +++++++ .../Pages/Admin/UserFavorites/Edit.cshtml.cs | 80 +++++++++++++ .../Pages/Admin/UserFavorites/Index.cshtml | 42 +++++++ .../Pages/Admin/UserFavorites/Index.cshtml.cs | 26 +++++ .../Pages/Admin/UserLibraries/Create.cshtml | 55 +++++++++ .../Admin/UserLibraries/Create.cshtml.cs | 42 +++++++ .../Pages/Admin/UserLibraries/Delete.cshtml | 52 +++++++++ .../Admin/UserLibraries/Delete.cshtml.cs | 57 +++++++++ .../Pages/Admin/UserLibraries/Edit.cshtml | 56 +++++++++ .../Pages/Admin/UserLibraries/Edit.cshtml.cs | 80 +++++++++++++ .../Pages/Admin/UserLibraries/Index.cshtml | 46 ++++++++ .../Pages/Admin/UserLibraries/Index.cshtml.cs | 26 +++++ GameLibrary/Pages/Admin/Users/Create.cshtml | 45 ++++++++ .../Pages/Admin/Users/Create.cshtml.cs | 65 +++++++++++ GameLibrary/Pages/Admin/Users/Delete.cshtml | 42 +++++++ .../Pages/Admin/Users/Delete.cshtml.cs | 67 +++++++++++ GameLibrary/Pages/Admin/Users/Edit.cshtml | 45 ++++++++ GameLibrary/Pages/Admin/Users/Edit.cshtml.cs | 89 +++++++++++++++ GameLibrary/Pages/Admin/Users/Index.cshtml | 40 +++++++ GameLibrary/Pages/Admin/Users/Index.cshtml.cs | 23 ++++ 44 files changed, 2097 insertions(+) create mode 100644 GameLibrary/Pages/Admin/Dashboard.cshtml create mode 100644 GameLibrary/Pages/Admin/Dashboard.cshtml.cs create mode 100644 GameLibrary/Pages/Admin/Index.cshtml create mode 100644 GameLibrary/Pages/Admin/Index.cshtml.cs create mode 100644 GameLibrary/Pages/Admin/Reviews/Create.cshtml create mode 100644 GameLibrary/Pages/Admin/Reviews/Create.cshtml.cs create mode 100644 GameLibrary/Pages/Admin/Reviews/Delete.cshtml create mode 100644 GameLibrary/Pages/Admin/Reviews/Delete.cshtml.cs create mode 100644 GameLibrary/Pages/Admin/Reviews/Edit.cshtml create mode 100644 GameLibrary/Pages/Admin/Reviews/Edit.cshtml.cs create mode 100644 GameLibrary/Pages/Admin/Reviews/Index.cshtml create mode 100644 GameLibrary/Pages/Admin/Reviews/Index.cshtml.cs create mode 100644 GameLibrary/Pages/Admin/Roles/Create.cshtml create mode 100644 GameLibrary/Pages/Admin/Roles/Create.cshtml.cs create mode 100644 GameLibrary/Pages/Admin/Roles/Delete.cshtml create mode 100644 GameLibrary/Pages/Admin/Roles/Delete.cshtml.cs create mode 100644 GameLibrary/Pages/Admin/Roles/Edit.cshtml create mode 100644 GameLibrary/Pages/Admin/Roles/Edit.cshtml.cs create mode 100644 GameLibrary/Pages/Admin/Roles/Index.cshtml create mode 100644 GameLibrary/Pages/Admin/Roles/Index.cshtml.cs create mode 100644 GameLibrary/Pages/Admin/UserFavorites/Create.cshtml create mode 100644 GameLibrary/Pages/Admin/UserFavorites/Create.cshtml.cs create mode 100644 GameLibrary/Pages/Admin/UserFavorites/Delete.cshtml create mode 100644 GameLibrary/Pages/Admin/UserFavorites/Delete.cshtml.cs create mode 100644 GameLibrary/Pages/Admin/UserFavorites/Edit.cshtml create mode 100644 GameLibrary/Pages/Admin/UserFavorites/Edit.cshtml.cs create mode 100644 GameLibrary/Pages/Admin/UserFavorites/Index.cshtml create mode 100644 GameLibrary/Pages/Admin/UserFavorites/Index.cshtml.cs create mode 100644 GameLibrary/Pages/Admin/UserLibraries/Create.cshtml create mode 100644 GameLibrary/Pages/Admin/UserLibraries/Create.cshtml.cs create mode 100644 GameLibrary/Pages/Admin/UserLibraries/Delete.cshtml create mode 100644 GameLibrary/Pages/Admin/UserLibraries/Delete.cshtml.cs create mode 100644 GameLibrary/Pages/Admin/UserLibraries/Edit.cshtml create mode 100644 GameLibrary/Pages/Admin/UserLibraries/Edit.cshtml.cs create mode 100644 GameLibrary/Pages/Admin/UserLibraries/Index.cshtml create mode 100644 GameLibrary/Pages/Admin/UserLibraries/Index.cshtml.cs create mode 100644 GameLibrary/Pages/Admin/Users/Create.cshtml create mode 100644 GameLibrary/Pages/Admin/Users/Create.cshtml.cs create mode 100644 GameLibrary/Pages/Admin/Users/Delete.cshtml create mode 100644 GameLibrary/Pages/Admin/Users/Delete.cshtml.cs create mode 100644 GameLibrary/Pages/Admin/Users/Edit.cshtml create mode 100644 GameLibrary/Pages/Admin/Users/Edit.cshtml.cs create mode 100644 GameLibrary/Pages/Admin/Users/Index.cshtml create mode 100644 GameLibrary/Pages/Admin/Users/Index.cshtml.cs diff --git a/GameLibrary/Pages/Admin/Dashboard.cshtml b/GameLibrary/Pages/Admin/Dashboard.cshtml new file mode 100644 index 0000000..e85799a --- /dev/null +++ b/GameLibrary/Pages/Admin/Dashboard.cshtml @@ -0,0 +1,108 @@ +@page +@model GameLibrary.Pages.Admin.DashboardModel + +@{ + ViewData["Title"] = "Dashboard"; +} + +

Admin Dashboard

+ +
+
+
+
Total Games
+
+
@Model.TotalGames
+
+
+
+
+
+
Total Reviews
+
+
@Model.TotalReviews
+
+
+
+
+
+
Total Users
+
+
@Model.TotalUsers
+
+
+
+
+
+
Total Favorites
+
+
@Model.TotalFavorites
+
+
+
+
+ +
+
+

Game Genres

+ +
+
+

User Activity

+ +
+
+ +
+
+

Review Ratings

+ +
+
+ +@section Scripts { + + +} diff --git a/GameLibrary/Pages/Admin/Dashboard.cshtml.cs b/GameLibrary/Pages/Admin/Dashboard.cshtml.cs new file mode 100644 index 0000000..7b4ea33 --- /dev/null +++ b/GameLibrary/Pages/Admin/Dashboard.cshtml.cs @@ -0,0 +1,44 @@ +using GameLibrary.Data; +using Microsoft.AspNetCore.Mvc.RazorPages; +using Microsoft.EntityFrameworkCore; + +namespace GameLibrary.Pages.Admin; + +public class DashboardModel : PageModel +{ + private readonly ApplicationDbContext _context; + + public DashboardModel(ApplicationDbContext context) + { + _context = context; + } + + public int TotalGames { get; set; } + public int TotalReviews { get; set; } + public int TotalUsers { get; set; } + public int TotalFavorites { get; set; } + + public Dictionary GameGenres { get; set; } = new(); + public Dictionary UserActivity { get; set; } = new(); + public Dictionary ReviewRatings { get; set; } = new(); + + public async Task OnGetAsync() + { + TotalGames = await _context.Games.CountAsync(); + TotalReviews = await _context.Reviews.CountAsync(); + TotalUsers = await _context.Users.CountAsync(); + TotalFavorites = await _context.UserFavorites.CountAsync(); + + GameGenres = await _context.Games + .GroupBy(g => g.Genre) + .ToDictionaryAsync(g => g.Key, g => g.Count()); + + UserActivity = await _context.Users + .GroupBy(u => u.CreatedAt.Date) + .ToDictionaryAsync(u => u.Key.ToString("yyyy-MM-dd"), u => u.Count()); + + ReviewRatings = await _context.Reviews + .GroupBy(r => r.Rating) + .ToDictionaryAsync(r => r.Key, r => r.Count()); + } +} diff --git a/GameLibrary/Pages/Admin/Index.cshtml b/GameLibrary/Pages/Admin/Index.cshtml new file mode 100644 index 0000000..05fd7c2 --- /dev/null +++ b/GameLibrary/Pages/Admin/Index.cshtml @@ -0,0 +1,18 @@ +@page +@model GameLibrary.Pages.Admin.IndexModel + +@{ + ViewData["Title"] = "Admin Index"; +} + +

Admin Index

+ +
+ Dashboard + Games + Reviews + User Libraries + User Favorites + Users + Roles +
diff --git a/GameLibrary/Pages/Admin/Index.cshtml.cs b/GameLibrary/Pages/Admin/Index.cshtml.cs new file mode 100644 index 0000000..2aaf07b --- /dev/null +++ b/GameLibrary/Pages/Admin/Index.cshtml.cs @@ -0,0 +1,34 @@ +using Microsoft.AspNetCore.Mvc.RazorPages; + +namespace GameLibrary.Pages.Admin; + +public class IndexModel : PageModel +{ + public List NavigationLinks { get; set; } = new(); + + public void OnGet() + { + NavigationLinks.Add("Dashboard"); + NavigationLinks.Add("Games"); + NavigationLinks.Add("Reviews"); + NavigationLinks.Add("User Libraries"); + NavigationLinks.Add("User Favorites"); + NavigationLinks.Add("Users"); + NavigationLinks.Add("Roles"); + } + + public IActionResult OnPostNavigate(string link) + { + return link switch + { + "Dashboard" => RedirectToPage("Dashboard"), + "Games" => RedirectToPage("Games/Index"), + "Reviews" => RedirectToPage("Reviews/Index"), + "User Libraries" => RedirectToPage("UserLibraries/Index"), + "User Favorites" => RedirectToPage("UserFavorites/Index"), + "Users" => RedirectToPage("Users/Index"), + "Roles" => RedirectToPage("Roles/Index"), + _ => Page() + }; + } +} diff --git a/GameLibrary/Pages/Admin/Reviews/Create.cshtml b/GameLibrary/Pages/Admin/Reviews/Create.cshtml new file mode 100644 index 0000000..bec443d --- /dev/null +++ b/GameLibrary/Pages/Admin/Reviews/Create.cshtml @@ -0,0 +1,55 @@ +@page +@model GameLibrary.Pages.Admin.Reviews.CreateModel + +@{ + ViewData["Title"] = "Create Review"; +} + + + +
+

Create Review

+
+ +
+
+
+
+ +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + Back to List +
+
+
+
+ + diff --git a/GameLibrary/Pages/Admin/Reviews/Create.cshtml.cs b/GameLibrary/Pages/Admin/Reviews/Create.cshtml.cs new file mode 100644 index 0000000..bbaae3d --- /dev/null +++ b/GameLibrary/Pages/Admin/Reviews/Create.cshtml.cs @@ -0,0 +1,42 @@ +using GameLibrary.Data; +using GameLibrary.Models; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; +using Microsoft.AspNetCore.Mvc.Rendering; +using Microsoft.EntityFrameworkCore; + +namespace GameLibrary.Pages.Admin.Reviews; + +public class CreateModel : PageModel +{ + private readonly ApplicationDbContext _context; + + public CreateModel(ApplicationDbContext context) + { + _context = context; + } + + public IActionResult OnGet() + { + ViewData["Games"] = new SelectList(_context.Games, "Id", "Title"); + ViewData["Users"] = new SelectList(_context.Users, "Id", "UserName"); + return Page(); + } + + [BindProperty] + public Review? Review { get; set; } + + public async Task OnPostAsync() + { + if (!ModelState.IsValid) + { + return Page(); + } + + Review!.CreatedAt = DateTime.UtcNow; + _context.Reviews.Add(Review); + await _context.SaveChangesAsync(); + + return RedirectToPage("./Index"); + } +} diff --git a/GameLibrary/Pages/Admin/Reviews/Delete.cshtml b/GameLibrary/Pages/Admin/Reviews/Delete.cshtml new file mode 100644 index 0000000..d3f4e18 --- /dev/null +++ b/GameLibrary/Pages/Admin/Reviews/Delete.cshtml @@ -0,0 +1,53 @@ +@page +@model GameLibrary.Pages.Admin.Reviews.DeleteModel + +@{ + ViewData["Title"] = "Delete Review"; +} + + + +
+

Delete Review

+

Are you sure you want to delete this review?

+
+ +
+
+
+
+ @Html.DisplayNameFor(model => model.Review!.GameId) +
+
+ @Html.DisplayFor(model => model.Review!.GameId) +
+
+ @Html.DisplayNameFor(model => model.Review!.UserId) +
+
+ @Html.DisplayFor(model => model.Review!.UserId) +
+
+ @Html.DisplayNameFor(model => model.Review!.Rating) +
+
+ @Html.DisplayFor(model => model.Review!.Rating) +
+
+ @Html.DisplayNameFor(model => model.Review!.Content) +
+
+ @Html.DisplayFor(model => model.Review!.Content) +
+
+
+
+ +
+
+ + + Back to List +
+
+ diff --git a/GameLibrary/Pages/Admin/Reviews/Delete.cshtml.cs b/GameLibrary/Pages/Admin/Reviews/Delete.cshtml.cs new file mode 100644 index 0000000..2db232f --- /dev/null +++ b/GameLibrary/Pages/Admin/Reviews/Delete.cshtml.cs @@ -0,0 +1,54 @@ +using GameLibrary.Data; +using GameLibrary.Models; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; +using Microsoft.EntityFrameworkCore; + +namespace GameLibrary.Pages.Admin.Reviews; + +public class DeleteModel : PageModel +{ + private readonly ApplicationDbContext _context; + + public DeleteModel(ApplicationDbContext context) + { + _context = context; + } + + [BindProperty] + public Review? Review { get; set; } + + public async Task OnGetAsync(Guid? id) + { + if (id == null) + { + return NotFound(); + } + + Review = await _context.Reviews.FirstOrDefaultAsync(m => m.Id == id); + + if (Review == null) + { + return NotFound(); + } + return Page(); + } + + public async Task OnPostAsync(Guid? id) + { + if (id == null) + { + return NotFound(); + } + + Review = await _context.Reviews.FindAsync(id); + + if (Review != null) + { + _context.Reviews.Remove(Review); + await _context.SaveChangesAsync(); + } + + return RedirectToPage("./Index"); + } +} diff --git a/GameLibrary/Pages/Admin/Reviews/Edit.cshtml b/GameLibrary/Pages/Admin/Reviews/Edit.cshtml new file mode 100644 index 0000000..972a36e --- /dev/null +++ b/GameLibrary/Pages/Admin/Reviews/Edit.cshtml @@ -0,0 +1,56 @@ +@page +@model GameLibrary.Pages.Admin.Reviews.EditModel + +@{ + ViewData["Title"] = "Edit Review"; +} + + + +
+

Edit Review

+
+ +
+
+
+
+ + +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + Back to List +
+
+
+
+ + diff --git a/GameLibrary/Pages/Admin/Reviews/Edit.cshtml.cs b/GameLibrary/Pages/Admin/Reviews/Edit.cshtml.cs new file mode 100644 index 0000000..85953d5 --- /dev/null +++ b/GameLibrary/Pages/Admin/Reviews/Edit.cshtml.cs @@ -0,0 +1,71 @@ +using GameLibrary.Data; +using GameLibrary.Models; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; +using Microsoft.AspNetCore.Mvc.Rendering; +using Microsoft.EntityFrameworkCore; + +namespace GameLibrary.Pages.Admin.Reviews; + +public class EditModel : PageModel +{ + private readonly ApplicationDbContext _context; + + public EditModel(ApplicationDbContext context) + { + _context = context; + } + + [BindProperty] + public Review? Review { get; set; } + + public SelectList Games { get; set; } = null!; + public SelectList Users { get; set; } = null!; + + public async Task OnGetAsync(Guid? id) + { + if (id == null) + { + return NotFound(); + } + + Review = await _context.Reviews.FirstOrDefaultAsync(m => m.Id == id); + + if (Review == null) + { + return NotFound(); + } + + Games = new SelectList(await _context.Games.ToListAsync(), "Id", "Title"); + Users = new SelectList(await _context.Users.ToListAsync(), "Id", "UserName"); + + return Page(); + } + + public async Task OnPostAsync() + { + if (!ModelState.IsValid) + { + return Page(); + } + + var reviewToUpdate = await _context.Reviews.FindAsync(Review!.Id); + + if (reviewToUpdate == null) + { + return NotFound(); + } + + if (await TryUpdateModelAsync( + reviewToUpdate, + "review", + r => r.GameId, r => r.UserId, r => r.Rating, r => r.Content)) + { + reviewToUpdate.UpdatedAt = DateTime.UtcNow; + await _context.SaveChangesAsync(); + return RedirectToPage("./Index"); + } + + return Page(); + } +} diff --git a/GameLibrary/Pages/Admin/Reviews/Index.cshtml b/GameLibrary/Pages/Admin/Reviews/Index.cshtml new file mode 100644 index 0000000..528c1cb --- /dev/null +++ b/GameLibrary/Pages/Admin/Reviews/Index.cshtml @@ -0,0 +1,46 @@ +@page +@model GameLibrary.Pages.Admin.Reviews.IndexModel + +@{ + ViewData["Title"] = "Reviews"; +} + + + +
+

Reviews

+

+ Create New +

+
+ +
+ + + + + + + + + + + + @foreach (var item in Model.Reviews!) + { + + + + + + + + } + +
GameUserRatingContentActions
@Html.DisplayFor(modelItem => item.GameId)@Html.DisplayFor(modelItem => item.UserId)@Html.DisplayFor(modelItem => item.Rating)@Html.DisplayFor(modelItem => item.Content) + Edit

+ Delete +
+
+ + diff --git a/GameLibrary/Pages/Admin/Reviews/Index.cshtml.cs b/GameLibrary/Pages/Admin/Reviews/Index.cshtml.cs new file mode 100644 index 0000000..9f6d00d --- /dev/null +++ b/GameLibrary/Pages/Admin/Reviews/Index.cshtml.cs @@ -0,0 +1,26 @@ +using GameLibrary.Data; +using GameLibrary.Models; +using Microsoft.AspNetCore.Mvc.RazorPages; +using Microsoft.EntityFrameworkCore; + +namespace GameLibrary.Pages.Admin.Reviews; + +public class IndexModel : PageModel +{ + private readonly ApplicationDbContext _context; + + public IndexModel(ApplicationDbContext context) + { + _context = context; + } + + public IList? Reviews { get; set; } + + public async Task OnGetAsync() + { + Reviews = await _context.Reviews + .Include(r => r.Game) + .Include(r => r.User) + .ToListAsync(); + } +} diff --git a/GameLibrary/Pages/Admin/Roles/Create.cshtml b/GameLibrary/Pages/Admin/Roles/Create.cshtml new file mode 100644 index 0000000..86e303c --- /dev/null +++ b/GameLibrary/Pages/Admin/Roles/Create.cshtml @@ -0,0 +1,20 @@ +@page +@model GameLibrary.Pages.Admin.Roles.CreateModel + +@{ + ViewData["Title"] = "Create Role"; +} + +

Create Role

+ +
+
+ + + +
+
+ + Back to List +
+
diff --git a/GameLibrary/Pages/Admin/Roles/Create.cshtml.cs b/GameLibrary/Pages/Admin/Roles/Create.cshtml.cs new file mode 100644 index 0000000..9b347e5 --- /dev/null +++ b/GameLibrary/Pages/Admin/Roles/Create.cshtml.cs @@ -0,0 +1,37 @@ +using GameLibrary.Data; +using GameLibrary.Models; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; + +namespace GameLibrary.Pages.Admin.Roles; + +public class CreateModel : PageModel +{ + private readonly ApplicationDbContext _context; + + public CreateModel(ApplicationDbContext context) + { + _context = context; + } + + [BindProperty] + public Role Role { get; set; } = new Role(); + + public IActionResult OnGet() + { + return Page(); + } + + public async Task OnPostAsync() + { + if (!ModelState.IsValid) + { + return Page(); + } + + _context.Roles.Add(Role); + await _context.SaveChangesAsync(); + + return RedirectToPage("./Index"); + } +} diff --git a/GameLibrary/Pages/Admin/Roles/Delete.cshtml b/GameLibrary/Pages/Admin/Roles/Delete.cshtml new file mode 100644 index 0000000..1f19f10 --- /dev/null +++ b/GameLibrary/Pages/Admin/Roles/Delete.cshtml @@ -0,0 +1,29 @@ +@page +@model GameLibrary.Pages.Admin.Roles.DeleteModel + +@{ + ViewData["Title"] = "Delete Role"; +} + +

Delete Role

+ +

Are you sure you want to delete this role?

+ +
+

Role

+
+
+
+ @Html.DisplayNameFor(model => model.Role.Name) +
+
+ @Html.DisplayFor(model => model.Role.Name) +
+
+ +
+ + + Back to List +
+
diff --git a/GameLibrary/Pages/Admin/Roles/Delete.cshtml.cs b/GameLibrary/Pages/Admin/Roles/Delete.cshtml.cs new file mode 100644 index 0000000..bad4e37 --- /dev/null +++ b/GameLibrary/Pages/Admin/Roles/Delete.cshtml.cs @@ -0,0 +1,54 @@ +using GameLibrary.Data; +using GameLibrary.Models; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; +using Microsoft.EntityFrameworkCore; + +namespace GameLibrary.Pages.Admin.Roles; + +public class DeleteModel : PageModel +{ + private readonly ApplicationDbContext _context; + + public DeleteModel(ApplicationDbContext context) + { + _context = context; + } + + [BindProperty] + public Role? Role { get; set; } + + public async Task OnGetAsync(Guid? id) + { + if (id == null) + { + return NotFound(); + } + + Role = await _context.Roles.FirstOrDefaultAsync(m => m.Id == id); + + if (Role == null) + { + return NotFound(); + } + return Page(); + } + + public async Task OnPostAsync(Guid? id) + { + if (id == null) + { + return NotFound(); + } + + Role = await _context.Roles.FindAsync(id); + + if (Role != null) + { + _context.Roles.Remove(Role); + await _context.SaveChangesAsync(); + } + + return RedirectToPage("./Index"); + } +} diff --git a/GameLibrary/Pages/Admin/Roles/Edit.cshtml b/GameLibrary/Pages/Admin/Roles/Edit.cshtml new file mode 100644 index 0000000..4579660 --- /dev/null +++ b/GameLibrary/Pages/Admin/Roles/Edit.cshtml @@ -0,0 +1,20 @@ +@page +@model GameLibrary.Pages.Admin.Roles.EditModel + +@{ + ViewData["Title"] = "Edit Role"; +} + +

Edit Role

+ +
+
+ + + +
+
+ + Back to List +
+
diff --git a/GameLibrary/Pages/Admin/Roles/Edit.cshtml.cs b/GameLibrary/Pages/Admin/Roles/Edit.cshtml.cs new file mode 100644 index 0000000..5c29b67 --- /dev/null +++ b/GameLibrary/Pages/Admin/Roles/Edit.cshtml.cs @@ -0,0 +1,68 @@ +using GameLibrary.Data; +using GameLibrary.Models; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; + +namespace GameLibrary.Pages.Admin.Roles; + +public class EditModel : PageModel +{ + private readonly ApplicationDbContext _context; + + public EditModel(ApplicationDbContext context) + { + _context = context; + } + + [BindProperty] + public Role Role { get; set; } = new Role(); + + public async Task OnGetAsync(Guid? id) + { + if (id == null) + { + return NotFound(); + } + + Role = await _context.Roles.FindAsync(id); + + if (Role == null) + { + return NotFound(); + } + return Page(); + } + + public async Task OnPostAsync() + { + if (!ModelState.IsValid) + { + return Page(); + } + + _context.Attach(Role).State = Microsoft.EntityFrameworkCore.EntityState.Modified; + + try + { + await _context.SaveChangesAsync(); + } + catch (DbUpdateConcurrencyException) + { + if (!RoleExists(Role.Id)) + { + return NotFound(); + } + else + { + throw; + } + } + + return RedirectToPage("./Index"); + } + + private bool RoleExists(Guid id) + { + return _context.Roles.Any(e => e.Id == id); + } +} diff --git a/GameLibrary/Pages/Admin/Roles/Index.cshtml b/GameLibrary/Pages/Admin/Roles/Index.cshtml new file mode 100644 index 0000000..6170098 --- /dev/null +++ b/GameLibrary/Pages/Admin/Roles/Index.cshtml @@ -0,0 +1,33 @@ +@page +@model GameLibrary.Pages.Admin.Roles.IndexModel + +@{ + ViewData["Title"] = "Roles"; +} + +

Roles

+ +

+ Create New Role +

+ + + + + + + + + + @foreach (var role in Model.Roles) + { + + + + + } + +
NameActions
@role.Name + Edit + Delete +
diff --git a/GameLibrary/Pages/Admin/Roles/Index.cshtml.cs b/GameLibrary/Pages/Admin/Roles/Index.cshtml.cs new file mode 100644 index 0000000..13168c6 --- /dev/null +++ b/GameLibrary/Pages/Admin/Roles/Index.cshtml.cs @@ -0,0 +1,23 @@ +using GameLibrary.Data; +using GameLibrary.Models; +using Microsoft.AspNetCore.Mvc.RazorPages; +using Microsoft.EntityFrameworkCore; + +namespace GameLibrary.Pages.Admin.Roles; + +public class IndexModel : PageModel +{ + private readonly ApplicationDbContext _context; + + public IndexModel(ApplicationDbContext context) + { + _context = context; + } + + public IList? Roles { get; set; } + + public async Task OnGetAsync() + { + Roles = await _context.Roles.ToListAsync(); + } +} diff --git a/GameLibrary/Pages/Admin/UserFavorites/Create.cshtml b/GameLibrary/Pages/Admin/UserFavorites/Create.cshtml new file mode 100644 index 0000000..86222b9 --- /dev/null +++ b/GameLibrary/Pages/Admin/UserFavorites/Create.cshtml @@ -0,0 +1,43 @@ +@page +@model GameLibrary.Pages.Admin.UserFavorites.CreateModel + +@{ + ViewData["Title"] = "Create User Favorite Entry"; +} + + + +
+

Create User Favorite Entry

+
+ +
+
+
+
+ +
+ + + +
+ +
+ + + +
+ +
+ + Back to List +
+
+
+
+ + diff --git a/GameLibrary/Pages/Admin/UserFavorites/Create.cshtml.cs b/GameLibrary/Pages/Admin/UserFavorites/Create.cshtml.cs new file mode 100644 index 0000000..e731e8c --- /dev/null +++ b/GameLibrary/Pages/Admin/UserFavorites/Create.cshtml.cs @@ -0,0 +1,42 @@ +using GameLibrary.Data; +using GameLibrary.Models; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; +using Microsoft.AspNetCore.Mvc.Rendering; +using Microsoft.EntityFrameworkCore; + +namespace GameLibrary.Pages.Admin.UserFavorites; + +public class CreateModel : PageModel +{ + private readonly ApplicationDbContext _context; + + public CreateModel(ApplicationDbContext context) + { + _context = context; + } + + public IActionResult OnGet() + { + ViewData["Games"] = new SelectList(_context.Games, "Id", "Title"); + ViewData["Users"] = new SelectList(_context.Users, "Id", "UserName"); + return Page(); + } + + [BindProperty] + public UserFavorite? UserFavorite { get; set; } + + public async Task OnPostAsync() + { + if (!ModelState.IsValid) + { + return Page(); + } + + UserFavorite!.AddedAt = DateTime.UtcNow; + _context.UserFavorites.Add(UserFavorite); + await _context.SaveChangesAsync(); + + return RedirectToPage("./Index"); + } +} diff --git a/GameLibrary/Pages/Admin/UserFavorites/Delete.cshtml b/GameLibrary/Pages/Admin/UserFavorites/Delete.cshtml new file mode 100644 index 0000000..544c9a0 --- /dev/null +++ b/GameLibrary/Pages/Admin/UserFavorites/Delete.cshtml @@ -0,0 +1,42 @@ +@page +@model GameLibrary.Pages.Admin.UserFavorites.DeleteModel + +@{ + ViewData["Title"] = "Delete User Favorite Entry"; +} + + + +
+

Delete User Favorite Entry

+

Are you sure you want to delete this user favorite entry?

+
+ +
+
+
+
+ @Html.DisplayNameFor(model => model.UserFavorite!.UserId) +
+
+ @Html.DisplayFor(model => model.UserFavorite!.UserId) +
+
+ @Html.DisplayNameFor(model => model.UserFavorite!.GameId) +
+
+ @Html.DisplayFor(model => model.UserFavorite!.GameId) +
+
+
+
+ +
+
+ + + Back to List +
+
+ + diff --git a/GameLibrary/Pages/Admin/UserFavorites/Delete.cshtml.cs b/GameLibrary/Pages/Admin/UserFavorites/Delete.cshtml.cs new file mode 100644 index 0000000..9aeceb8 --- /dev/null +++ b/GameLibrary/Pages/Admin/UserFavorites/Delete.cshtml.cs @@ -0,0 +1,57 @@ +using GameLibrary.Data; +using GameLibrary.Models; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; +using Microsoft.EntityFrameworkCore; + +namespace GameLibrary.Pages.Admin.UserFavorites; + +public class DeleteModel : PageModel +{ + private readonly ApplicationDbContext _context; + + public DeleteModel(ApplicationDbContext context) + { + _context = context; + } + + [BindProperty] + public UserFavorite? UserFavorite { get; set; } + + public async Task OnGetAsync(Guid? id) + { + if (id == null) + { + return NotFound(); + } + + UserFavorite = await _context.UserFavorites + .Include(uf => uf.Game) + .Include(uf => uf.User) + .FirstOrDefaultAsync(m => m.Id == id); + + if (UserFavorite == null) + { + return NotFound(); + } + return Page(); + } + + public async Task OnPostAsync(Guid? id) + { + if (id == null) + { + return NotFound(); + } + + UserFavorite = await _context.UserFavorites.FindAsync(id); + + if (UserFavorite != null) + { + _context.UserFavorites.Remove(UserFavorite); + await _context.SaveChangesAsync(); + } + + return RedirectToPage("./Index"); + } +} diff --git a/GameLibrary/Pages/Admin/UserFavorites/Edit.cshtml b/GameLibrary/Pages/Admin/UserFavorites/Edit.cshtml new file mode 100644 index 0000000..a388085 --- /dev/null +++ b/GameLibrary/Pages/Admin/UserFavorites/Edit.cshtml @@ -0,0 +1,44 @@ +@page +@model GameLibrary.Pages.Admin.UserFavorites.EditModel + +@{ + ViewData["Title"] = "Edit User Favorite Entry"; +} + + + +
+

Edit User Favorite Entry

+
+ +
+
+
+
+ + +
+ + + +
+ +
+ + + +
+ +
+ + Back to List +
+
+
+
+ + diff --git a/GameLibrary/Pages/Admin/UserFavorites/Edit.cshtml.cs b/GameLibrary/Pages/Admin/UserFavorites/Edit.cshtml.cs new file mode 100644 index 0000000..2dd62ca --- /dev/null +++ b/GameLibrary/Pages/Admin/UserFavorites/Edit.cshtml.cs @@ -0,0 +1,80 @@ +using GameLibrary.Data; +using GameLibrary.Models; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; +using Microsoft.AspNetCore.Mvc.Rendering; +using Microsoft.EntityFrameworkCore; + +namespace GameLibrary.Pages.Admin.UserFavorites; + +public class EditModel : PageModel +{ + private readonly ApplicationDbContext _context; + + public EditModel(ApplicationDbContext context) + { + _context = context; + } + + [BindProperty] + public UserFavorite? UserFavorite { get; set; } + + public SelectList? Games { get; set; } + public SelectList? Users { get; set; } + + public async Task OnGetAsync(Guid? id) + { + if (id == null) + { + return NotFound(); + } + + UserFavorite = await _context.UserFavorites + .Include(uf => uf.Game) + .Include(uf => uf.User) + .FirstOrDefaultAsync(m => m.Id == id); + + if (UserFavorite == null) + { + return NotFound(); + } + + Games = new SelectList(_context.Games, "Id", "Title"); + Users = new SelectList(_context.Users, "Id", "UserName"); + + return Page(); + } + + public async Task OnPostAsync() + { + if (!ModelState.IsValid) + { + return Page(); + } + + _context.Attach(UserFavorite!).State = EntityState.Modified; + + try + { + await _context.SaveChangesAsync(); + } + catch (DbUpdateConcurrencyException) + { + if (!UserFavoriteExists(UserFavorite!.Id)) + { + return NotFound(); + } + else + { + throw; + } + } + + return RedirectToPage("./Index"); + } + + private bool UserFavoriteExists(Guid id) + { + return _context.UserFavorites.Any(e => e.Id == id); + } +} diff --git a/GameLibrary/Pages/Admin/UserFavorites/Index.cshtml b/GameLibrary/Pages/Admin/UserFavorites/Index.cshtml new file mode 100644 index 0000000..a9d6522 --- /dev/null +++ b/GameLibrary/Pages/Admin/UserFavorites/Index.cshtml @@ -0,0 +1,42 @@ +@page +@model GameLibrary.Pages.Admin.UserFavorites.IndexModel + +@{ + ViewData["Title"] = "User Favorite Entries"; +} + + + +
+

User Favorite Entries

+

+ Create New +

+
+ +
+ + + + + + + + + + @foreach (var item in Model.UserFavorites!) + { + + + + + + } + +
UserGameActions
@Html.DisplayFor(modelItem => item.User.UserName)@Html.DisplayFor(modelItem => item.Game.Title) + Edit + Delete +
+
+ + diff --git a/GameLibrary/Pages/Admin/UserFavorites/Index.cshtml.cs b/GameLibrary/Pages/Admin/UserFavorites/Index.cshtml.cs new file mode 100644 index 0000000..b368acc --- /dev/null +++ b/GameLibrary/Pages/Admin/UserFavorites/Index.cshtml.cs @@ -0,0 +1,26 @@ +using GameLibrary.Data; +using GameLibrary.Models; +using Microsoft.AspNetCore.Mvc.RazorPages; +using Microsoft.EntityFrameworkCore; + +namespace GameLibrary.Pages.Admin.UserFavorites; + +public class IndexModel : PageModel +{ + private readonly ApplicationDbContext _context; + + public IndexModel(ApplicationDbContext context) + { + _context = context; + } + + public IList? UserFavorites { get; set; } + + public async Task OnGetAsync() + { + UserFavorites = await _context.UserFavorites + .Include(uf => uf.Game) + .Include(uf => uf.User) + .ToListAsync(); + } +} diff --git a/GameLibrary/Pages/Admin/UserLibraries/Create.cshtml b/GameLibrary/Pages/Admin/UserLibraries/Create.cshtml new file mode 100644 index 0000000..602b1c0 --- /dev/null +++ b/GameLibrary/Pages/Admin/UserLibraries/Create.cshtml @@ -0,0 +1,55 @@ +@page +@model GameLibrary.Pages.Admin.UserLibraries.CreateModel + +@{ + ViewData["Title"] = "Create User Library Entry"; +} + + + +
+

Create User Library Entry

+
+ +
+
+
+
+ +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + Back to List +
+
+
+
+ + diff --git a/GameLibrary/Pages/Admin/UserLibraries/Create.cshtml.cs b/GameLibrary/Pages/Admin/UserLibraries/Create.cshtml.cs new file mode 100644 index 0000000..14dd0ab --- /dev/null +++ b/GameLibrary/Pages/Admin/UserLibraries/Create.cshtml.cs @@ -0,0 +1,42 @@ +using GameLibrary.Data; +using GameLibrary.Models; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; +using Microsoft.AspNetCore.Mvc.Rendering; +using Microsoft.EntityFrameworkCore; + +namespace GameLibrary.Pages.Admin.UserLibraries; + +public class CreateModel : PageModel +{ + private readonly ApplicationDbContext _context; + + public CreateModel(ApplicationDbContext context) + { + _context = context; + } + + public IActionResult OnGet() + { + ViewData["Games"] = new SelectList(_context.Games, "Id", "Title"); + ViewData["Users"] = new SelectList(_context.Users, "Id", "UserName"); + return Page(); + } + + [BindProperty] + public UserLibrary? UserLibrary { get; set; } + + public async Task OnPostAsync() + { + if (!ModelState.IsValid) + { + return Page(); + } + + UserLibrary!.AddedDate = DateTime.UtcNow; + _context.UserLibraries.Add(UserLibrary); + await _context.SaveChangesAsync(); + + return RedirectToPage("./Index"); + } +} diff --git a/GameLibrary/Pages/Admin/UserLibraries/Delete.cshtml b/GameLibrary/Pages/Admin/UserLibraries/Delete.cshtml new file mode 100644 index 0000000..fef5724 --- /dev/null +++ b/GameLibrary/Pages/Admin/UserLibraries/Delete.cshtml @@ -0,0 +1,52 @@ +@page +@model GameLibrary.Pages.Admin.UserLibraries.DeleteModel + +@{ + ViewData["Title"] = "Delete User Library Entry"; +} + + +
+

Delete User Library Entry

+

Are you sure you want to delete this entry?

+
+ +
+
+
+
+ @Html.DisplayNameFor(model => model.UserLibrary!.UserId) +
+
+ @Html.DisplayFor(model => model.UserLibrary!.UserId) +
+
+ @Html.DisplayNameFor(model => model.UserLibrary!.GameId) +
+
+ @Html.DisplayFor(model => model.UserLibrary!.GameId) +
+
+ @Html.DisplayNameFor(model => model.UserLibrary!.Status) +
+
+ @Html.DisplayFor(model => model.UserLibrary!.Status) +
+
+ @Html.DisplayNameFor(model => model.UserLibrary!.IsUpcoming) +
+
+ @Html.DisplayFor(model => model.UserLibrary!.IsUpcoming) +
+
+
+
+ +
+
+ + + Back to List +
+
+ diff --git a/GameLibrary/Pages/Admin/UserLibraries/Delete.cshtml.cs b/GameLibrary/Pages/Admin/UserLibraries/Delete.cshtml.cs new file mode 100644 index 0000000..05116e9 --- /dev/null +++ b/GameLibrary/Pages/Admin/UserLibraries/Delete.cshtml.cs @@ -0,0 +1,57 @@ +using GameLibrary.Data; +using GameLibrary.Models; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; +using Microsoft.EntityFrameworkCore; + +namespace GameLibrary.Pages.Admin.UserLibraries; + +public class DeleteModel : PageModel +{ + private readonly ApplicationDbContext _context; + + public DeleteModel(ApplicationDbContext context) + { + _context = context; + } + + [BindProperty] + public UserLibrary? UserLibrary { get; set; } + + public async Task OnGetAsync(Guid? id) + { + if (id == null) + { + return NotFound(); + } + + UserLibrary = await _context.UserLibraries + .Include(ul => ul.Game) + .Include(ul => ul.User) + .FirstOrDefaultAsync(m => m.Id == id); + + if (UserLibrary == null) + { + return NotFound(); + } + return Page(); + } + + public async Task OnPostAsync(Guid? id) + { + if (id == null) + { + return NotFound(); + } + + UserLibrary = await _context.UserLibraries.FindAsync(id); + + if (UserLibrary != null) + { + _context.UserLibraries.Remove(UserLibrary); + await _context.SaveChangesAsync(); + } + + return RedirectToPage("./Index"); + } +} diff --git a/GameLibrary/Pages/Admin/UserLibraries/Edit.cshtml b/GameLibrary/Pages/Admin/UserLibraries/Edit.cshtml new file mode 100644 index 0000000..f6fad91 --- /dev/null +++ b/GameLibrary/Pages/Admin/UserLibraries/Edit.cshtml @@ -0,0 +1,56 @@ +@page +@model GameLibrary.Pages.Admin.UserLibraries.EditModel + +@{ + ViewData["Title"] = "Edit User Library Entry"; +} + + + +
+

Edit User Library Entry

+
+ +
+
+
+
+ + +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + Back to List +
+
+
+
+ + diff --git a/GameLibrary/Pages/Admin/UserLibraries/Edit.cshtml.cs b/GameLibrary/Pages/Admin/UserLibraries/Edit.cshtml.cs new file mode 100644 index 0000000..918cadb --- /dev/null +++ b/GameLibrary/Pages/Admin/UserLibraries/Edit.cshtml.cs @@ -0,0 +1,80 @@ +using GameLibrary.Data; +using GameLibrary.Models; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; +using Microsoft.AspNetCore.Mvc.Rendering; +using Microsoft.EntityFrameworkCore; + +namespace GameLibrary.Pages.Admin.UserLibraries; + +public class EditModel : PageModel +{ + private readonly ApplicationDbContext _context; + + public EditModel(ApplicationDbContext context) + { + _context = context; + } + + [BindProperty] + public UserLibrary? UserLibrary { get; set; } + + public SelectList? Games { get; set; } + public SelectList? Users { get; set; } + + public async Task OnGetAsync(Guid? id) + { + if (id == null) + { + return NotFound(); + } + + UserLibrary = await _context.UserLibraries + .Include(ul => ul.Game) + .Include(ul => ul.User) + .FirstOrDefaultAsync(m => m.Id == id); + + if (UserLibrary == null) + { + return NotFound(); + } + + Games = new SelectList(_context.Games, "Id", "Title"); + Users = new SelectList(_context.Users, "Id", "UserName"); + + return Page(); + } + + public async Task OnPostAsync() + { + if (!ModelState.IsValid) + { + return Page(); + } + + _context.Attach(UserLibrary!).State = EntityState.Modified; + + try + { + await _context.SaveChangesAsync(); + } + catch (DbUpdateConcurrencyException) + { + if (!UserLibraryExists(UserLibrary!.Id)) + { + return NotFound(); + } + else + { + throw; + } + } + + return RedirectToPage("./Index"); + } + + private bool UserLibraryExists(Guid id) + { + return _context.UserLibraries.Any(e => e.Id == id); + } +} diff --git a/GameLibrary/Pages/Admin/UserLibraries/Index.cshtml b/GameLibrary/Pages/Admin/UserLibraries/Index.cshtml new file mode 100644 index 0000000..39321a2 --- /dev/null +++ b/GameLibrary/Pages/Admin/UserLibraries/Index.cshtml @@ -0,0 +1,46 @@ +@page +@model GameLibrary.Pages.Admin.UserLibraries.IndexModel + +@{ + ViewData["Title"] = "User Libraries"; +} + + +
+
+

User Libraries


+ +

+ Create New +

+
+ +
+ + + + + + + + + @foreach (var item in Model.UserLibraries!) + { + + + + + } + +
User Library DetailsActions
+ User: @Html.DisplayFor(modelItem => item.UserId)
+ Game: @Html.DisplayFor(modelItem => item.GameId)
+ Status: @Html.DisplayFor(modelItem => item.Status)
+ Is Upcoming: @Html.DisplayFor(modelItem => item.IsUpcoming) + 		+ Edit

+ Delete +
+
+
+ diff --git a/GameLibrary/Pages/Admin/UserLibraries/Index.cshtml.cs b/GameLibrary/Pages/Admin/UserLibraries/Index.cshtml.cs new file mode 100644 index 0000000..27612e8 --- /dev/null +++ b/GameLibrary/Pages/Admin/UserLibraries/Index.cshtml.cs @@ -0,0 +1,26 @@ +using GameLibrary.Data; +using GameLibrary.Models; +using Microsoft.AspNetCore.Mvc.RazorPages; +using Microsoft.EntityFrameworkCore; + +namespace GameLibrary.Pages.Admin.UserLibraries; + +public class IndexModel : PageModel +{ + private readonly ApplicationDbContext _context; + + public IndexModel(ApplicationDbContext context) + { + _context = context; + } + + public IList? UserLibraries { get; set; } + + public async Task OnGetAsync() + { + UserLibraries = await _context.UserLibraries + .Include(ul => ul.Game) + .Include(ul => ul.User) + .ToListAsync(); + } +} diff --git a/GameLibrary/Pages/Admin/Users/Create.cshtml b/GameLibrary/Pages/Admin/Users/Create.cshtml new file mode 100644 index 0000000..781c0f1 --- /dev/null +++ b/GameLibrary/Pages/Admin/Users/Create.cshtml @@ -0,0 +1,45 @@ +@page +@model GameLibrary.Pages.Admin.Users.CreateModel + +@{ + ViewData["Title"] = "Create User"; +} + + + +
+

Create User

+
+ +
+
+
+
+ +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + Back to List +
+
+
+
+ + diff --git a/GameLibrary/Pages/Admin/Users/Create.cshtml.cs b/GameLibrary/Pages/Admin/Users/Create.cshtml.cs new file mode 100644 index 0000000..f3f3971 --- /dev/null +++ b/GameLibrary/Pages/Admin/Users/Create.cshtml.cs @@ -0,0 +1,65 @@ +using GameLibrary.Data; +using GameLibrary.Models; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; +using Microsoft.AspNetCore.Identity; + +namespace GameLibrary.Pages.Admin.Users; + +public class CreateModel : PageModel +{ + private readonly ApplicationDbContext _context; + private readonly UserManager _userManager; + + public CreateModel(ApplicationDbContext context, UserManager userManager) + { + _context = context; + _userManager = userManager; + } + + public IActionResult OnGet() + { + User = new User + { + UserName = "", + Email = "", + CreatedAt = DateTime.UtcNow + }; + return Page(); + } + + [BindProperty] + public User? User { get; set; } + + [BindProperty] + public string? Password { get; set; } + + public async Task OnPostAsync() + { + if (!ModelState.IsValid) + { + return Page(); + } + + var user = new User + { + UserName = User!.UserName, + Email = User.Email, + CreatedAt = DateTime.UtcNow + }; + + var result = await _userManager.CreateAsync(user, Password!); + + if (result.Succeeded) + { + return RedirectToPage("./Index"); + } + + foreach (var error in result.Errors) + { + ModelState.AddModelError(string.Empty, error.Description); + } + + return Page(); + } +} diff --git a/GameLibrary/Pages/Admin/Users/Delete.cshtml b/GameLibrary/Pages/Admin/Users/Delete.cshtml new file mode 100644 index 0000000..44e7c20 --- /dev/null +++ b/GameLibrary/Pages/Admin/Users/Delete.cshtml @@ -0,0 +1,42 @@ +@page +@model GameLibrary.Pages.Admin.Users.DeleteModel + +@{ + ViewData["Title"] = "Delete User"; +} + + + +
+

Delete User

+

Are you sure you want to delete this user?

+
+ +
+
+
+
+ @Html.DisplayNameFor(model => model.User!.UserName) +
+
+ @Html.DisplayFor(model => model.User!.UserName) +
+
+ @Html.DisplayNameFor(model => model.User!.Email) +
+
+ @Html.DisplayFor(model => model.User!.Email) +
+
+
+
+ +
+
+ + + Back to List +
+
+ + diff --git a/GameLibrary/Pages/Admin/Users/Delete.cshtml.cs b/GameLibrary/Pages/Admin/Users/Delete.cshtml.cs new file mode 100644 index 0000000..fb3e454 --- /dev/null +++ b/GameLibrary/Pages/Admin/Users/Delete.cshtml.cs @@ -0,0 +1,67 @@ +using GameLibrary.Data; +using GameLibrary.Models; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; +using Microsoft.AspNetCore.Identity; +using Microsoft.EntityFrameworkCore; + +namespace GameLibrary.Pages.Admin.Users; + +public class DeleteModel : PageModel +{ + private readonly ApplicationDbContext _context; + private readonly UserManager _userManager; + + public DeleteModel(ApplicationDbContext context, UserManager userManager) + { + _context = context; + _userManager = userManager; + } + + [BindProperty] + public User? User { get; set; } + + public async Task OnGetAsync(Guid? id) + { + if (id == null) + { + return NotFound(); + } + + User = await _userManager.Users.FirstOrDefaultAsync(u => u.Id == id); + + if (User == null) + { + return NotFound(); + } + + return Page(); + } + + public async Task OnPostAsync(Guid? id) + { + if (id == null) + { + return NotFound(); + } + + User = await _userManager.Users.FindAsync(id); + + if (User != null) + { + var result = await _userManager.DeleteAsync(User); + + if (result.Succeeded) + { + return RedirectToPage("./Index"); + } + + foreach (var error in result.Errors) + { + ModelState.AddModelError(string.Empty, error.Description); + } + } + + return Page(); + } +} diff --git a/GameLibrary/Pages/Admin/Users/Edit.cshtml b/GameLibrary/Pages/Admin/Users/Edit.cshtml new file mode 100644 index 0000000..f7c13b1 --- /dev/null +++ b/GameLibrary/Pages/Admin/Users/Edit.cshtml @@ -0,0 +1,45 @@ +@page +@model GameLibrary.Pages.Admin.Users.EditModel + +@{ + ViewData["Title"] = "Edit User"; +} + + + +
+

Edit User

+
+ +
+
+
+
+ +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + Back to List +
+
+
+
+ + diff --git a/GameLibrary/Pages/Admin/Users/Edit.cshtml.cs b/GameLibrary/Pages/Admin/Users/Edit.cshtml.cs new file mode 100644 index 0000000..e8eb56f --- /dev/null +++ b/GameLibrary/Pages/Admin/Users/Edit.cshtml.cs @@ -0,0 +1,89 @@ +using GameLibrary.Data; +using GameLibrary.Models; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; +using Microsoft.AspNetCore.Identity; +using Microsoft.EntityFrameworkCore; + +namespace GameLibrary.Pages.Admin.Users; + +public class EditModel : PageModel +{ + private readonly ApplicationDbContext _context; + private readonly UserManager _userManager; + + public EditModel(ApplicationDbContext context, UserManager userManager) + { + _context = context; + _userManager = userManager; + } + + [BindProperty] + public User? User { get; set; } + + [BindProperty] + public string? Password { get; set; } + + public async Task OnGetAsync(Guid? id) + { + if (id == null) + { + return NotFound(); + } + + User = await _userManager.Users.FirstOrDefaultAsync(u => u.Id == id); + + if (User == null) + { + return NotFound(); + } + + return Page(); + } + + public async Task OnPostAsync(Guid? id) + { + if (!ModelState.IsValid) + { + return Page(); + } + + if (id == null) + { + return NotFound(); + } + + var userToUpdate = await _userManager.Users.FirstOrDefaultAsync(u => u.Id == id); + + if (userToUpdate == null) + { + return NotFound(); + } + + if (await TryUpdateModelAsync( + userToUpdate, + "user", + u => u.UserName, u => u.Email)) + { + if (!string.IsNullOrEmpty(Password)) + { + var token = await _userManager.GeneratePasswordResetTokenAsync(userToUpdate); + var result = await _userManager.ResetPasswordAsync(userToUpdate, token, Password); + + if (!result.Succeeded) + { + foreach (var error in result.Errors) + { + ModelState.AddModelError(string.Empty, error.Description); + } + return Page(); + } + } + + await _context.SaveChangesAsync(); + return RedirectToPage("./Index"); + } + + return Page(); + } +} diff --git a/GameLibrary/Pages/Admin/Users/Index.cshtml b/GameLibrary/Pages/Admin/Users/Index.cshtml new file mode 100644 index 0000000..a8940a6 --- /dev/null +++ b/GameLibrary/Pages/Admin/Users/Index.cshtml @@ -0,0 +1,40 @@ +@page +@model GameLibrary.Pages.Admin.Users.IndexModel + +@{ + ViewData["Title"] = "Users"; +} + + +
+

Users

+

+ Create New +

+
+ +
+ + + + + + + + + + @foreach (var item in Model.Users!) + { + + + + + + } + +
User NameEmailActions
@Html.DisplayFor(modelItem => item.UserName)@Html.DisplayFor(modelItem => item.Email) + Edit + Delete +
+
+ diff --git a/GameLibrary/Pages/Admin/Users/Index.cshtml.cs b/GameLibrary/Pages/Admin/Users/Index.cshtml.cs new file mode 100644 index 0000000..3fb17c6 --- /dev/null +++ b/GameLibrary/Pages/Admin/Users/Index.cshtml.cs @@ -0,0 +1,23 @@ +using GameLibrary.Data; +using GameLibrary.Models; +using Microsoft.AspNetCore.Mvc.RazorPages; +using Microsoft.EntityFrameworkCore; + +namespace GameLibrary.Pages.Admin.Users; + +public class IndexModel : PageModel +{ + private readonly ApplicationDbContext _context; + + public IndexModel(ApplicationDbContext context) + { + _context = context; + } + + public IList? Users { get; set; } + + public async Task OnGetAsync() + { + Users = await _context.Users.ToListAsync(); + } +} From 2f41406bb79455f4ede54b44e9c3c805a3b4dd31 Mon Sep 17 00:00:00 2001 From: Mathias Date: Mon, 18 Nov 2024 20:44:16 +0100 Subject: [PATCH 02/19] Admin Panel Nav in admin panel --- GameLibrary/Migrations/20241123065457_Init.cs | 15 ++- .../Pages/Account/Manage/_ManageNav.cshtml | 2 +- GameLibrary/Pages/Admin/Dashboard.cshtml | 108 ----------------- GameLibrary/Pages/Admin/Dashboard.cshtml.cs | 44 ------- GameLibrary/Pages/Admin/Games/Index.cshtml | 1 + GameLibrary/Pages/Admin/Index.cshtml | 109 ++++++++++++++++-- GameLibrary/Pages/Admin/Index.cshtml.cs | 66 +++++++---- GameLibrary/Pages/Admin/ManageNavPages.cs | 55 +++++++++ .../Pages/Admin/Reviews/Create.cshtml.cs | 22 +++- .../Pages/Admin/Reviews/Delete.cshtml.cs | 14 +++ .../Pages/Admin/Reviews/Edit.cshtml.cs | 14 +++ GameLibrary/Pages/Admin/Reviews/Index.cshtml | 1 + .../Pages/Admin/Reviews/Index.cshtml.cs | 14 +++ .../Pages/Admin/Roles/Create.cshtml.cs | 14 +++ .../Pages/Admin/Roles/Delete.cshtml.cs | 14 +++ GameLibrary/Pages/Admin/Roles/Edit.cshtml.cs | 15 +++ GameLibrary/Pages/Admin/Roles/Index.cshtml | 1 + GameLibrary/Pages/Admin/Roles/Index.cshtml.cs | 14 +++ .../Admin/UserFavorites/Create.cshtml.cs | 22 +++- .../Admin/UserFavorites/Delete.cshtml.cs | 14 +++ .../Pages/Admin/UserFavorites/Edit.cshtml.cs | 14 +++ .../Pages/Admin/UserFavorites/Index.cshtml | 1 + .../Pages/Admin/UserFavorites/Index.cshtml.cs | 14 +++ .../Admin/UserLibraries/Create.cshtml.cs | 22 +++- .../Admin/UserLibraries/Delete.cshtml.cs | 14 +++ .../Pages/Admin/UserLibraries/Edit.cshtml.cs | 14 +++ .../Pages/Admin/UserLibraries/Index.cshtml | 1 + .../Pages/Admin/UserLibraries/Index.cshtml.cs | 14 +++ .../Pages/Admin/Users/Create.cshtml.cs | 16 ++- .../Pages/Admin/Users/Delete.cshtml.cs | 18 ++- GameLibrary/Pages/Admin/Users/Edit.cshtml.cs | 16 ++- GameLibrary/Pages/Admin/Users/Index.cshtml | 1 + GameLibrary/Pages/Admin/Users/Index.cshtml.cs | 14 +++ GameLibrary/Pages/Admin/_Layout.cshtml | 25 ++++ GameLibrary/Pages/Admin/_ManageNav.cshtml | 9 ++ 35 files changed, 555 insertions(+), 197 deletions(-) delete mode 100644 GameLibrary/Pages/Admin/Dashboard.cshtml delete mode 100644 GameLibrary/Pages/Admin/Dashboard.cshtml.cs create mode 100644 GameLibrary/Pages/Admin/ManageNavPages.cs create mode 100644 GameLibrary/Pages/Admin/_Layout.cshtml create mode 100644 GameLibrary/Pages/Admin/_ManageNav.cshtml diff --git a/GameLibrary/Migrations/20241123065457_Init.cs b/GameLibrary/Migrations/20241123065457_Init.cs index 41df414..6a02e4f 100644 --- a/GameLibrary/Migrations/20241123065457_Init.cs +++ b/GameLibrary/Migrations/20241123065457_Init.cs @@ -1,4 +1,17 @@ -using System; +// Copyright 2024 Web.Tech. Group17 +// +// Licensed under the Apache License, Version 2.0 (the "License"): +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + using Microsoft.EntityFrameworkCore.Migrations; #nullable disable diff --git a/GameLibrary/Pages/Account/Manage/_ManageNav.cshtml b/GameLibrary/Pages/Account/Manage/_ManageNav.cshtml index 6d2863c..6d8f6ec 100644 --- a/GameLibrary/Pages/Account/Manage/_ManageNav.cshtml +++ b/GameLibrary/Pages/Account/Manage/_ManageNav.cshtml @@ -2,7 +2,7 @@ @{ var hasExternalLogins = (await SignInManager.GetExternalAuthenticationSchemesAsync()).Any(); } -
    +
    • Profile
    • Email
    • Password
      • diff --git a/GameLibrary/Pages/Admin/Dashboard.cshtml b/GameLibrary/Pages/Admin/Dashboard.cshtml deleted file mode 100644 index e85799a..0000000 --- a/GameLibrary/Pages/Admin/Dashboard.cshtml +++ /dev/null @@ -1,108 +0,0 @@ -@page -@model GameLibrary.Pages.Admin.DashboardModel - -@{ - ViewData["Title"] = "Dashboard"; -} - -

      Admin Dashboard

      - -
      -
      -
      -
      Total Games
      -
      -
      @Model.TotalGames
      -
      -
      -
      -
      -
      -
      Total Reviews
      -
      -
      @Model.TotalReviews
      -
      -
      -
      -
      -
      -
      Total Users
      -
      -
      @Model.TotalUsers
      -
      -
      -
      -
      -
      -
      Total Favorites
      -
      -
      @Model.TotalFavorites
      -
      -
      -
      -
      - -
      -
      -

      Game Genres

      - -
      -
      -

      User Activity

      - -
      -
      - -
      -
      -

      Review Ratings

      - -
      -
      - -@section Scripts { - - -} diff --git a/GameLibrary/Pages/Admin/Dashboard.cshtml.cs b/GameLibrary/Pages/Admin/Dashboard.cshtml.cs deleted file mode 100644 index 7b4ea33..0000000 --- a/GameLibrary/Pages/Admin/Dashboard.cshtml.cs +++ /dev/null @@ -1,44 +0,0 @@ -using GameLibrary.Data; -using Microsoft.AspNetCore.Mvc.RazorPages; -using Microsoft.EntityFrameworkCore; - -namespace GameLibrary.Pages.Admin; - -public class DashboardModel : PageModel -{ - private readonly ApplicationDbContext _context; - - public DashboardModel(ApplicationDbContext context) - { - _context = context; - } - - public int TotalGames { get; set; } - public int TotalReviews { get; set; } - public int TotalUsers { get; set; } - public int TotalFavorites { get; set; } - - public Dictionary GameGenres { get; set; } = new(); - public Dictionary UserActivity { get; set; } = new(); - public Dictionary ReviewRatings { get; set; } = new(); - - public async Task OnGetAsync() - { - TotalGames = await _context.Games.CountAsync(); - TotalReviews = await _context.Reviews.CountAsync(); - TotalUsers = await _context.Users.CountAsync(); - TotalFavorites = await _context.UserFavorites.CountAsync(); - - GameGenres = await _context.Games - .GroupBy(g => g.Genre) - .ToDictionaryAsync(g => g.Key, g => g.Count()); - - UserActivity = await _context.Users - .GroupBy(u => u.CreatedAt.Date) - .ToDictionaryAsync(u => u.Key.ToString("yyyy-MM-dd"), u => u.Count()); - - ReviewRatings = await _context.Reviews - .GroupBy(r => r.Rating) - .ToDictionaryAsync(r => r.Key, r => r.Count()); - } -} diff --git a/GameLibrary/Pages/Admin/Games/Index.cshtml b/GameLibrary/Pages/Admin/Games/Index.cshtml index 7643c65..fbea4d6 100644 --- a/GameLibrary/Pages/Admin/Games/Index.cshtml +++ b/GameLibrary/Pages/Admin/Games/Index.cshtml @@ -3,6 +3,7 @@ @{ ViewData["Title"] = "Admin Page"; + ViewData["ActivePage"] = ManageNavPages.Games; } diff --git a/GameLibrary/Pages/Admin/Index.cshtml b/GameLibrary/Pages/Admin/Index.cshtml index 05fd7c2..5c08bf5 100644 --- a/GameLibrary/Pages/Admin/Index.cshtml +++ b/GameLibrary/Pages/Admin/Index.cshtml @@ -3,16 +3,107 @@ @{ ViewData["Title"] = "Admin Index"; + ViewData["ActivePage"] = ManageNavPages.Index; } -

      Admin Index

      +

      Admin Dashboard

      -
      - Dashboard - Games - Reviews - User Libraries - User Favorites - Users - Roles +
      +
      +
      +
      Total Games
      +
      +
      @Model.TotalGames
      +
      +
      +
      +
      +
      +
      Total Reviews
      +
      +
      @Model.TotalReviews
      +
      +
      +
      +
      +
      +
      Total Users
      +
      +
      @Model.TotalUsers
      +
      +
      +
      +
      +
      +
      Total Favorites
      +
      +
      @Model.TotalFavorites
      +
      +
      +
      + +
      +
      +

      Game Genres

      + +
      +
      +

      User Activity

      + +
      +
      + +
      +
      +

      Review Ratings

      + +
      +
      + +@section Scripts { + + +} diff --git a/GameLibrary/Pages/Admin/Index.cshtml.cs b/GameLibrary/Pages/Admin/Index.cshtml.cs index 2aaf07b..d6e633c 100644 --- a/GameLibrary/Pages/Admin/Index.cshtml.cs +++ b/GameLibrary/Pages/Admin/Index.cshtml.cs @@ -1,34 +1,58 @@ +// Copyright 2024 Web.Tech. Group17 +// +// Licensed under the Apache License, Version 2.0 (the "License"): +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +using GameLibrary.Data; using Microsoft.AspNetCore.Mvc.RazorPages; +using Microsoft.EntityFrameworkCore; namespace GameLibrary.Pages.Admin; public class IndexModel : PageModel { - public List NavigationLinks { get; set; } = new(); + private readonly ApplicationDbContext _context; - public void OnGet() + public IndexModel(ApplicationDbContext context) { - NavigationLinks.Add("Dashboard"); - NavigationLinks.Add("Games"); - NavigationLinks.Add("Reviews"); - NavigationLinks.Add("User Libraries"); - NavigationLinks.Add("User Favorites"); - NavigationLinks.Add("Users"); - NavigationLinks.Add("Roles"); + _context = context; } - public IActionResult OnPostNavigate(string link) + public int TotalGames { get; set; } + public int TotalReviews { get; set; } + public int TotalUsers { get; set; } + public int TotalFavorites { get; set; } + + public Dictionary GameGenres { get; set; } = new(); + public Dictionary UserActivity { get; set; } = new(); + public Dictionary ReviewRatings { get; set; } = new(); + + public async Task OnGetAsync() { - return link switch - { - "Dashboard" => RedirectToPage("Dashboard"), - "Games" => RedirectToPage("Games/Index"), - "Reviews" => RedirectToPage("Reviews/Index"), - "User Libraries" => RedirectToPage("UserLibraries/Index"), - "User Favorites" => RedirectToPage("UserFavorites/Index"), - "Users" => RedirectToPage("Users/Index"), - "Roles" => RedirectToPage("Roles/Index"), - _ => Page() - }; + TotalGames = await _context.Games.CountAsync(); + TotalReviews = await _context.Reviews.CountAsync(); + TotalUsers = await _context.Users.CountAsync(); + TotalFavorites = await _context.UserFavorites.CountAsync(); + + GameGenres = await _context.Games + .GroupBy(g => g.Genre) + .ToDictionaryAsync(g => g.Key, g => g.Count()); + + UserActivity = await _context.Users + .GroupBy(u => u.CreatedAt.Date) + .ToDictionaryAsync(u => u.Key.ToString("yyyy-MM-dd"), u => u.Count()); + + ReviewRatings = await _context.Reviews + .GroupBy(r => r.Rating) + .ToDictionaryAsync(r => r.Key, r => r.Count()); } } diff --git a/GameLibrary/Pages/Admin/ManageNavPages.cs b/GameLibrary/Pages/Admin/ManageNavPages.cs new file mode 100644 index 0000000..66aa5d9 --- /dev/null +++ b/GameLibrary/Pages/Admin/ManageNavPages.cs @@ -0,0 +1,55 @@ +// Copyright 2024 Web.Tech. Group17 +// +// Licensed under the Apache License, Version 2.0 (the "License"): +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#nullable disable + +using Microsoft.AspNetCore.Mvc.Rendering; + +namespace GameLibrary.Pages.Admin; + +/// +/// This API supports the ASP.NET Core Identity default UI infrastructure and is not intended to be used directly from your code. +/// This API may change or be removed in future releases. +/// +public static class ManageNavPages +{ + public static string Index => "Index"; + public static string Games => "Games/Index"; + public static string Reviews => "Reviews/Index"; + public static string UserLibraries => "UserLibraries/Index"; + public static string UserFavorites => "UserFavorites/Index"; + public static string Users => "Users/Index"; + public static string Roles => "Roles/Index"; + + public static string IndexNavClass(ViewContext viewContext) => PageNavClass(viewContext, Index); + public static string GamesNavClass(ViewContext viewContext) => PageNavClass(viewContext, Games); + public static string ReviewsNavClass(ViewContext viewContext) => PageNavClass(viewContext, Reviews); + public static string UserLibrariesNavClass(ViewContext viewContext) => PageNavClass(viewContext, UserLibraries); + public static string UserFavoritesNavClass(ViewContext viewContext) => PageNavClass(viewContext, UserFavorites); + public static string UsersNavClass(ViewContext viewContext) => PageNavClass(viewContext, Users); + public static string RolesNavClass(ViewContext viewContext) => PageNavClass(viewContext, Roles); + + /// + /// Determines the active navigation class for the specified page. + /// + /// The current view context. + /// The page name to check for active state. + /// CSS class name indicating the active state, or null if not active. + public static string PageNavClass(ViewContext viewContext, string page) + { + var activePage = viewContext.ViewData["ActivePage"] as string + ?? System.IO.Path.GetFileNameWithoutExtension(viewContext.ActionDescriptor.DisplayName); + return string.Equals(activePage, page, StringComparison.OrdinalIgnoreCase) ? "active" : null; + } +} diff --git a/GameLibrary/Pages/Admin/Reviews/Create.cshtml.cs b/GameLibrary/Pages/Admin/Reviews/Create.cshtml.cs index bbaae3d..d7810d7 100644 --- a/GameLibrary/Pages/Admin/Reviews/Create.cshtml.cs +++ b/GameLibrary/Pages/Admin/Reviews/Create.cshtml.cs @@ -1,9 +1,22 @@ +// Copyright 2024 Web.Tech. Group17 +// +// Licensed under the Apache License, Version 2.0 (the "License"): +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + using GameLibrary.Data; using GameLibrary.Models; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.Mvc.Rendering; -using Microsoft.EntityFrameworkCore; namespace GameLibrary.Pages.Admin.Reviews; @@ -16,10 +29,13 @@ public CreateModel(ApplicationDbContext context) _context = context; } + public SelectList Games { get; set; } = null!; + public SelectList Users { get; set; } = null!; + public IActionResult OnGet() { - ViewData["Games"] = new SelectList(_context.Games, "Id", "Title"); - ViewData["Users"] = new SelectList(_context.Users, "Id", "UserName"); + Games = new SelectList(_context.Games, "Id", "Title"); + Users = new SelectList(_context.Users, "Id", "UserName"); return Page(); } diff --git a/GameLibrary/Pages/Admin/Reviews/Delete.cshtml.cs b/GameLibrary/Pages/Admin/Reviews/Delete.cshtml.cs index 2db232f..95764d6 100644 --- a/GameLibrary/Pages/Admin/Reviews/Delete.cshtml.cs +++ b/GameLibrary/Pages/Admin/Reviews/Delete.cshtml.cs @@ -1,3 +1,17 @@ +// Copyright 2024 Web.Tech. Group17 +// +// Licensed under the Apache License, Version 2.0 (the "License"): +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + using GameLibrary.Data; using GameLibrary.Models; using Microsoft.AspNetCore.Mvc; diff --git a/GameLibrary/Pages/Admin/Reviews/Edit.cshtml.cs b/GameLibrary/Pages/Admin/Reviews/Edit.cshtml.cs index 85953d5..aa87edc 100644 --- a/GameLibrary/Pages/Admin/Reviews/Edit.cshtml.cs +++ b/GameLibrary/Pages/Admin/Reviews/Edit.cshtml.cs @@ -1,3 +1,17 @@ +// Copyright 2024 Web.Tech. Group17 +// +// Licensed under the Apache License, Version 2.0 (the "License"): +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + using GameLibrary.Data; using GameLibrary.Models; using Microsoft.AspNetCore.Mvc; diff --git a/GameLibrary/Pages/Admin/Reviews/Index.cshtml b/GameLibrary/Pages/Admin/Reviews/Index.cshtml index 528c1cb..1974788 100644 --- a/GameLibrary/Pages/Admin/Reviews/Index.cshtml +++ b/GameLibrary/Pages/Admin/Reviews/Index.cshtml @@ -3,6 +3,7 @@ @{ ViewData["Title"] = "Reviews"; + ViewData["ActivePage"] = ManageNavPages.Reviews; } diff --git a/GameLibrary/Pages/Admin/Reviews/Index.cshtml.cs b/GameLibrary/Pages/Admin/Reviews/Index.cshtml.cs index 9f6d00d..51d2382 100644 --- a/GameLibrary/Pages/Admin/Reviews/Index.cshtml.cs +++ b/GameLibrary/Pages/Admin/Reviews/Index.cshtml.cs @@ -1,3 +1,17 @@ +// Copyright 2024 Web.Tech. Group17 +// +// Licensed under the Apache License, Version 2.0 (the "License"): +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + using GameLibrary.Data; using GameLibrary.Models; using Microsoft.AspNetCore.Mvc.RazorPages; diff --git a/GameLibrary/Pages/Admin/Roles/Create.cshtml.cs b/GameLibrary/Pages/Admin/Roles/Create.cshtml.cs index 9b347e5..11e5f4f 100644 --- a/GameLibrary/Pages/Admin/Roles/Create.cshtml.cs +++ b/GameLibrary/Pages/Admin/Roles/Create.cshtml.cs @@ -1,3 +1,17 @@ +// Copyright 2024 Web.Tech. Group17 +// +// Licensed under the Apache License, Version 2.0 (the "License"): +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + using GameLibrary.Data; using GameLibrary.Models; using Microsoft.AspNetCore.Mvc; diff --git a/GameLibrary/Pages/Admin/Roles/Delete.cshtml.cs b/GameLibrary/Pages/Admin/Roles/Delete.cshtml.cs index bad4e37..92a249b 100644 --- a/GameLibrary/Pages/Admin/Roles/Delete.cshtml.cs +++ b/GameLibrary/Pages/Admin/Roles/Delete.cshtml.cs @@ -1,3 +1,17 @@ +// Copyright 2024 Web.Tech. Group17 +// +// Licensed under the Apache License, Version 2.0 (the "License"): +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + using GameLibrary.Data; using GameLibrary.Models; using Microsoft.AspNetCore.Mvc; diff --git a/GameLibrary/Pages/Admin/Roles/Edit.cshtml.cs b/GameLibrary/Pages/Admin/Roles/Edit.cshtml.cs index 5c29b67..c2a4ba8 100644 --- a/GameLibrary/Pages/Admin/Roles/Edit.cshtml.cs +++ b/GameLibrary/Pages/Admin/Roles/Edit.cshtml.cs @@ -1,7 +1,22 @@ +// Copyright 2024 Web.Tech. Group17 +// +// Licensed under the Apache License, Version 2.0 (the "License"): +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + using GameLibrary.Data; using GameLibrary.Models; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; +using Microsoft.EntityFrameworkCore; namespace GameLibrary.Pages.Admin.Roles; diff --git a/GameLibrary/Pages/Admin/Roles/Index.cshtml b/GameLibrary/Pages/Admin/Roles/Index.cshtml index 6170098..e0b20cd 100644 --- a/GameLibrary/Pages/Admin/Roles/Index.cshtml +++ b/GameLibrary/Pages/Admin/Roles/Index.cshtml @@ -3,6 +3,7 @@ @{ ViewData["Title"] = "Roles"; + ViewData["ActivePage"] = ManageNavPages.Roles; }

      Roles

      diff --git a/GameLibrary/Pages/Admin/Roles/Index.cshtml.cs b/GameLibrary/Pages/Admin/Roles/Index.cshtml.cs index 13168c6..f016f18 100644 --- a/GameLibrary/Pages/Admin/Roles/Index.cshtml.cs +++ b/GameLibrary/Pages/Admin/Roles/Index.cshtml.cs @@ -1,3 +1,17 @@ +// Copyright 2024 Web.Tech. Group17 +// +// Licensed under the Apache License, Version 2.0 (the "License"): +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + using GameLibrary.Data; using GameLibrary.Models; using Microsoft.AspNetCore.Mvc.RazorPages; diff --git a/GameLibrary/Pages/Admin/UserFavorites/Create.cshtml.cs b/GameLibrary/Pages/Admin/UserFavorites/Create.cshtml.cs index e731e8c..cd28d07 100644 --- a/GameLibrary/Pages/Admin/UserFavorites/Create.cshtml.cs +++ b/GameLibrary/Pages/Admin/UserFavorites/Create.cshtml.cs @@ -1,9 +1,22 @@ +// Copyright 2024 Web.Tech. Group17 +// +// Licensed under the Apache License, Version 2.0 (the "License"): +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + using GameLibrary.Data; using GameLibrary.Models; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.Mvc.Rendering; -using Microsoft.EntityFrameworkCore; namespace GameLibrary.Pages.Admin.UserFavorites; @@ -16,10 +29,13 @@ public CreateModel(ApplicationDbContext context) _context = context; } + public SelectList Games { get; set; } = null!; + public SelectList Users { get; set; } = null!; + public IActionResult OnGet() { - ViewData["Games"] = new SelectList(_context.Games, "Id", "Title"); - ViewData["Users"] = new SelectList(_context.Users, "Id", "UserName"); + Games = new SelectList(_context.Games, "Id", "Title"); + Users = new SelectList(_context.Users, "Id", "UserName"); return Page(); } diff --git a/GameLibrary/Pages/Admin/UserFavorites/Delete.cshtml.cs b/GameLibrary/Pages/Admin/UserFavorites/Delete.cshtml.cs index 9aeceb8..24b7fdc 100644 --- a/GameLibrary/Pages/Admin/UserFavorites/Delete.cshtml.cs +++ b/GameLibrary/Pages/Admin/UserFavorites/Delete.cshtml.cs @@ -1,3 +1,17 @@ +// Copyright 2024 Web.Tech. Group17 +// +// Licensed under the Apache License, Version 2.0 (the "License"): +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + using GameLibrary.Data; using GameLibrary.Models; using Microsoft.AspNetCore.Mvc; diff --git a/GameLibrary/Pages/Admin/UserFavorites/Edit.cshtml.cs b/GameLibrary/Pages/Admin/UserFavorites/Edit.cshtml.cs index 2dd62ca..ddcf6f5 100644 --- a/GameLibrary/Pages/Admin/UserFavorites/Edit.cshtml.cs +++ b/GameLibrary/Pages/Admin/UserFavorites/Edit.cshtml.cs @@ -1,3 +1,17 @@ +// Copyright 2024 Web.Tech. Group17 +// +// Licensed under the Apache License, Version 2.0 (the "License"): +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + using GameLibrary.Data; using GameLibrary.Models; using Microsoft.AspNetCore.Mvc; diff --git a/GameLibrary/Pages/Admin/UserFavorites/Index.cshtml b/GameLibrary/Pages/Admin/UserFavorites/Index.cshtml index a9d6522..1316adf 100644 --- a/GameLibrary/Pages/Admin/UserFavorites/Index.cshtml +++ b/GameLibrary/Pages/Admin/UserFavorites/Index.cshtml @@ -3,6 +3,7 @@ @{ ViewData["Title"] = "User Favorite Entries"; + ViewData["ActivePage"] = ManageNavPages.UserFavorites; } diff --git a/GameLibrary/Pages/Admin/UserFavorites/Index.cshtml.cs b/GameLibrary/Pages/Admin/UserFavorites/Index.cshtml.cs index b368acc..475f4f6 100644 --- a/GameLibrary/Pages/Admin/UserFavorites/Index.cshtml.cs +++ b/GameLibrary/Pages/Admin/UserFavorites/Index.cshtml.cs @@ -1,3 +1,17 @@ +// Copyright 2024 Web.Tech. Group17 +// +// Licensed under the Apache License, Version 2.0 (the "License"): +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + using GameLibrary.Data; using GameLibrary.Models; using Microsoft.AspNetCore.Mvc.RazorPages; diff --git a/GameLibrary/Pages/Admin/UserLibraries/Create.cshtml.cs b/GameLibrary/Pages/Admin/UserLibraries/Create.cshtml.cs index 14dd0ab..756a458 100644 --- a/GameLibrary/Pages/Admin/UserLibraries/Create.cshtml.cs +++ b/GameLibrary/Pages/Admin/UserLibraries/Create.cshtml.cs @@ -1,9 +1,22 @@ +// Copyright 2024 Web.Tech. Group17 +// +// Licensed under the Apache License, Version 2.0 (the "License"): +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + using GameLibrary.Data; using GameLibrary.Models; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.Mvc.Rendering; -using Microsoft.EntityFrameworkCore; namespace GameLibrary.Pages.Admin.UserLibraries; @@ -16,10 +29,13 @@ public CreateModel(ApplicationDbContext context) _context = context; } + public SelectList Games { get; set; } = null!; + public SelectList Users { get; set; } = null!; + public IActionResult OnGet() { - ViewData["Games"] = new SelectList(_context.Games, "Id", "Title"); - ViewData["Users"] = new SelectList(_context.Users, "Id", "UserName"); + Games = new SelectList(_context.Games, "Id", "Title"); + Users = new SelectList(_context.Users, "Id", "UserName"); return Page(); } diff --git a/GameLibrary/Pages/Admin/UserLibraries/Delete.cshtml.cs b/GameLibrary/Pages/Admin/UserLibraries/Delete.cshtml.cs index 05116e9..7c07809 100644 --- a/GameLibrary/Pages/Admin/UserLibraries/Delete.cshtml.cs +++ b/GameLibrary/Pages/Admin/UserLibraries/Delete.cshtml.cs @@ -1,3 +1,17 @@ +// Copyright 2024 Web.Tech. Group17 +// +// Licensed under the Apache License, Version 2.0 (the "License"): +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + using GameLibrary.Data; using GameLibrary.Models; using Microsoft.AspNetCore.Mvc; diff --git a/GameLibrary/Pages/Admin/UserLibraries/Edit.cshtml.cs b/GameLibrary/Pages/Admin/UserLibraries/Edit.cshtml.cs index 918cadb..3dd5b2b 100644 --- a/GameLibrary/Pages/Admin/UserLibraries/Edit.cshtml.cs +++ b/GameLibrary/Pages/Admin/UserLibraries/Edit.cshtml.cs @@ -1,3 +1,17 @@ +// Copyright 2024 Web.Tech. Group17 +// +// Licensed under the Apache License, Version 2.0 (the "License"): +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + using GameLibrary.Data; using GameLibrary.Models; using Microsoft.AspNetCore.Mvc; diff --git a/GameLibrary/Pages/Admin/UserLibraries/Index.cshtml b/GameLibrary/Pages/Admin/UserLibraries/Index.cshtml index 39321a2..6d6f8f7 100644 --- a/GameLibrary/Pages/Admin/UserLibraries/Index.cshtml +++ b/GameLibrary/Pages/Admin/UserLibraries/Index.cshtml @@ -3,6 +3,7 @@ @{ ViewData["Title"] = "User Libraries"; + ViewData["ActivePage"] = ManageNavPages.UserLibraries; } diff --git a/GameLibrary/Pages/Admin/UserLibraries/Index.cshtml.cs b/GameLibrary/Pages/Admin/UserLibraries/Index.cshtml.cs index 27612e8..3941498 100644 --- a/GameLibrary/Pages/Admin/UserLibraries/Index.cshtml.cs +++ b/GameLibrary/Pages/Admin/UserLibraries/Index.cshtml.cs @@ -1,3 +1,17 @@ +// Copyright 2024 Web.Tech. Group17 +// +// Licensed under the Apache License, Version 2.0 (the "License"): +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + using GameLibrary.Data; using GameLibrary.Models; using Microsoft.AspNetCore.Mvc.RazorPages; diff --git a/GameLibrary/Pages/Admin/Users/Create.cshtml.cs b/GameLibrary/Pages/Admin/Users/Create.cshtml.cs index f3f3971..116f61f 100644 --- a/GameLibrary/Pages/Admin/Users/Create.cshtml.cs +++ b/GameLibrary/Pages/Admin/Users/Create.cshtml.cs @@ -1,8 +1,22 @@ +// Copyright 2024 Web.Tech. Group17 +// +// Licensed under the Apache License, Version 2.0 (the "License"): +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + using GameLibrary.Data; using GameLibrary.Models; +using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; -using Microsoft.AspNetCore.Identity; namespace GameLibrary.Pages.Admin.Users; diff --git a/GameLibrary/Pages/Admin/Users/Delete.cshtml.cs b/GameLibrary/Pages/Admin/Users/Delete.cshtml.cs index fb3e454..2244f48 100644 --- a/GameLibrary/Pages/Admin/Users/Delete.cshtml.cs +++ b/GameLibrary/Pages/Admin/Users/Delete.cshtml.cs @@ -1,8 +1,22 @@ +// Copyright 2024 Web.Tech. Group17 +// +// Licensed under the Apache License, Version 2.0 (the "License"): +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + using GameLibrary.Data; using GameLibrary.Models; +using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; -using Microsoft.AspNetCore.Identity; using Microsoft.EntityFrameworkCore; namespace GameLibrary.Pages.Admin.Users; @@ -45,7 +59,7 @@ public async Task OnPostAsync(Guid? id) return NotFound(); } - User = await _userManager.Users.FindAsync(id); + User = await _userManager.Users.FirstOrDefaultAsync(u => u.Id == id); if (User != null) { diff --git a/GameLibrary/Pages/Admin/Users/Edit.cshtml.cs b/GameLibrary/Pages/Admin/Users/Edit.cshtml.cs index e8eb56f..74be906 100644 --- a/GameLibrary/Pages/Admin/Users/Edit.cshtml.cs +++ b/GameLibrary/Pages/Admin/Users/Edit.cshtml.cs @@ -1,8 +1,22 @@ +// Copyright 2024 Web.Tech. Group17 +// +// Licensed under the Apache License, Version 2.0 (the "License"): +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + using GameLibrary.Data; using GameLibrary.Models; +using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; -using Microsoft.AspNetCore.Identity; using Microsoft.EntityFrameworkCore; namespace GameLibrary.Pages.Admin.Users; diff --git a/GameLibrary/Pages/Admin/Users/Index.cshtml b/GameLibrary/Pages/Admin/Users/Index.cshtml index a8940a6..e5796c4 100644 --- a/GameLibrary/Pages/Admin/Users/Index.cshtml +++ b/GameLibrary/Pages/Admin/Users/Index.cshtml @@ -3,6 +3,7 @@ @{ ViewData["Title"] = "Users"; + ViewData["ActivePage"] = ManageNavPages.Users; } diff --git a/GameLibrary/Pages/Admin/Users/Index.cshtml.cs b/GameLibrary/Pages/Admin/Users/Index.cshtml.cs index 3fb17c6..23cd227 100644 --- a/GameLibrary/Pages/Admin/Users/Index.cshtml.cs +++ b/GameLibrary/Pages/Admin/Users/Index.cshtml.cs @@ -1,3 +1,17 @@ +// Copyright 2024 Web.Tech. Group17 +// +// Licensed under the Apache License, Version 2.0 (the "License"): +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + using GameLibrary.Data; using GameLibrary.Models; using Microsoft.AspNetCore.Mvc.RazorPages; diff --git a/GameLibrary/Pages/Admin/_Layout.cshtml b/GameLibrary/Pages/Admin/_Layout.cshtml new file mode 100644 index 0000000..e6dbae8 --- /dev/null +++ b/GameLibrary/Pages/Admin/_Layout.cshtml @@ -0,0 +1,25 @@ +@{ + if (ViewData.TryGetValue("ParentLayout", out var parentLayout) && parentLayout != null) + { + Layout = parentLayout.ToString(); + } + else + { + Layout = "/Pages/Shared/_Layout.cshtml"; + } +} + +
      +
      +
      + +
      +
      + @RenderBody() +
      +
      +
      + +@section Scripts { + @RenderSection("Scripts", required: false) +} diff --git a/GameLibrary/Pages/Admin/_ManageNav.cshtml b/GameLibrary/Pages/Admin/_ManageNav.cshtml new file mode 100644 index 0000000..2778ee7 --- /dev/null +++ b/GameLibrary/Pages/Admin/_ManageNav.cshtml @@ -0,0 +1,9 @@ + From 7ead9b018f270090813da9e3744b8d7502cdb91b Mon Sep 17 00:00:00 2001 From: Mathias Date: Tue, 19 Nov 2024 08:20:19 +0100 Subject: [PATCH 03/19] Js changes Move image preview to site.js, since image preview is likely to be used multiple places. Remove unused js: * details.js * library.js Change site.css to simple.css in order to switch to Tailwind and DaisyUI for UI Can be undone if needed --- GameLibrary/Pages/Admin/Games/Create.cshtml | 13 - GameLibrary/Pages/Admin/Games/Edit.cshtml | 12 - GameLibrary/wwwroot/css/site.css | 862 ++++++++++++++++---- GameLibrary/wwwroot/js/games/details.js | 107 --- GameLibrary/wwwroot/js/games/library.js | 94 --- GameLibrary/wwwroot/js/site.js | 12 +- 6 files changed, 699 insertions(+), 401 deletions(-) delete mode 100644 GameLibrary/wwwroot/js/games/details.js delete mode 100644 GameLibrary/wwwroot/js/games/library.js diff --git a/GameLibrary/Pages/Admin/Games/Create.cshtml b/GameLibrary/Pages/Admin/Games/Create.cshtml index b0b463d..08b5285 100644 --- a/GameLibrary/Pages/Admin/Games/Create.cshtml +++ b/GameLibrary/Pages/Admin/Games/Create.cshtml @@ -56,17 +56,4 @@
      - - - diff --git a/GameLibrary/Pages/Admin/Games/Edit.cshtml b/GameLibrary/Pages/Admin/Games/Edit.cshtml index da0de65..9348322 100644 --- a/GameLibrary/Pages/Admin/Games/Edit.cshtml +++ b/GameLibrary/Pages/Admin/Games/Edit.cshtml @@ -61,16 +61,4 @@ - - diff --git a/GameLibrary/wwwroot/css/site.css b/GameLibrary/wwwroot/css/site.css index 19e4fdd..5781e8b 100644 --- a/GameLibrary/wwwroot/css/site.css +++ b/GameLibrary/wwwroot/css/site.css @@ -1,191 +1,711 @@ -/* Site-wide styles */ +/* Based on Simple.css by Andy Bell and windows 11 inspired */ +/* Global variables. */ +:root, +::backdrop { + /* Set sans-serif & mono fonts */ + --sans-font: -apple-system, BlinkMacSystemFont, "Segoe UI", "Noto Sans", "Roboto", "Arial", sans-serif; + --mono-font: Consolas, "Courier New", Menlo, Monaco, "Ubuntu Mono", monospace; + --standard-border-radius: 6px; + + /* Light theme colors */ + --bg: #ffffff; + --accent-bg: #f3f3f3; + --text: #1f1f1f; + --text-light: #606060; + --border: #d1d9e1; + --accent: #0078d4; + --accent-hover: #005a9e; + --accent-text: #ffffff; + --code: #d81b60; + --preformatted: #444444; + --marked: #ffcc00; + --disabled: #f7f7f7; +} + +/* Dark theme */ +@media (prefers-color-scheme: dark) { + :root, + ::backdrop { + color-scheme: dark; + --bg: #1e1e1e; + --accent-bg: #2e2e2e; + --text: #ffffff; + --text-light: #d9d9d9; + --accent: #1a73e8; + --accent-hover: #0c5bbf; + --accent-text: var(--bg); + --code: #ff7f7f; + --preformatted: #d9d9d9; + --disabled: #444444; + } + /* Add a bit of transparency so light media isn't so glaring in dark mode */ + img, + video { + opacity: 0.8; + } +} + +/* Reset box-sizing */ +*, *::before, *::after { + box-sizing: border-box; +} + +/* Reset default appearance */ +textarea, +select, +input, +progress { + appearance: none; + -webkit-appearance: none; + -moz-appearance: none; +} + +html { + /* Set the font globally */ + font-family: var(--sans-font); + scroll-behavior: smooth; +} + +/* Make the body a nice central block */ body { - background-color: #000235; - color: white; - font-family: Arial, sans-serif; - margin: 0; - padding: 0; + color: var(--text); + background-color: var(--bg); + font-size: 1.15rem; + line-height: 1.5; + display: grid; + grid-template-columns: 1fr min(45rem, 90%) 1fr; + margin: 0; +} +body > * { + grid-column: 2; +} + +/* Make the header bg full width, but the content inline with body */ +body > header { + background-color: var(--accent-bg); + border-bottom: 1px solid var(--border); + text-align: center; + padding: 0 0.5rem 2rem 0.5rem; + grid-column: 1 / -1; +} + +body > header > *:only-child { + margin-block-start: 2rem; +} + +body > header h1 { + max-width: 1200px; + margin: 1rem auto; +} + +body > header p { + max-width: 40rem; + margin: 1rem auto; +} + +/* Add a little padding to ensure spacing is correct between content and header > nav */ +main { + padding-top: 1.5rem; } +body > footer { + margin-top: 4rem; + padding: 2rem 1rem 1.5rem 1rem; + color: var(--text-light); + font-size: 0.9rem; + text-align: center; + border-top: 1px solid var(--border); +} + +/* Format headers */ h1 { - color: #FFD43B; - margin-top: 20px; + font-size: 3rem; +} + +h2 { + font-size: 2.6rem; + margin-top: 3rem; +} + +h3 { + font-size: 2rem; + margin-top: 3rem; } -.navbar { - background-color: transparent; +h4 { + font-size: 1.44rem; } -.nav-link { - color: #FFD43B; +h5 { + font-size: 1.15rem; } - .nav-link:hover { - color: #FFA500; - } +h6 { + font-size: 0.96rem; +} + +p { + margin: 1.5rem 0; +} -.btn { - background-color: #420599; - color: #FFD43B; +/* Prevent long strings from overflowing container */ +p, h1, h2, h3, h4, h5, h6 { + overflow-wrap: break-word; } - .btn:hover { - background-color: #5935c4; - } +/* Fix line height when title wraps */ +h1, +h2, +h3 { + line-height: 1.1; +} + +/* Reduce header size on mobile */ +@media only screen and (max-width: 720px) { + h1 { + font-size: 2.5rem; + } + + h2 { + font-size: 2.1rem; + } + + h3 { + font-size: 1.75rem; + } + + h4 { + font-size: 1.25rem; + } +} + +/* Format links & buttons */ +a, +a:visited { + color: var(--accent); +} + +a:hover { + text-decoration: none; +} + +button, +.button, +a.button, /* extra specificity to override a */ +input[type="submit"], +input[type="reset"], +input[type="button"], +label[type="button"] { + border: 1px solid var(--accent); + background-color: var(--accent); + color: var(--accent-text); + padding: 0.5rem 0.9rem; + text-decoration: none; + line-height: normal; +} + +.button[aria-disabled="true"], +input:disabled, +textarea:disabled, +select:disabled, +button[disabled] { + cursor: not-allowed; + background-color: var(--disabled); + border-color: var(--disabled); + color: var(--text-light); +} -.container { - width: 90%; - max-width: 1200px; - margin: 0 auto; - padding: 20px; +input[type="range"] { + padding: 0; } -/* Hero Section */ -.hero-section { - display: flex; - align-items: center; - justify-content: center; - position: relative; - height: 100vh; - background: url('/images/Gamer.webp') no-repeat center center; - background-size: cover; - overflow: hidden; +/* Set the cursor to '?' on an abbreviation and style the abbreviation to show that there is more information underneath */ +abbr[title] { + cursor: help; + text-decoration-line: underline; + text-decoration-style: dotted; } -.hero-overlay { - position: absolute; - top: 0; - left: 0; +button:enabled:hover, +.button:not([aria-disabled="true"]):hover, +input[type="submit"]:enabled:hover, +input[type="reset"]:enabled:hover, +input[type="button"]:enabled:hover, +label[type="button"]:hover { + background-color: var(--accent-hover); + border-color: var(--accent-hover); + cursor: pointer; +} + +.button:focus-visible, +button:focus-visible:where(:enabled), +input:enabled:focus-visible:where( + [type="submit"], + [type="reset"], + [type="button"] +) { + outline: 2px solid var(--accent); + outline-offset: 1px; +} + +/* Format navigation */ +header > nav { + font-size: 1rem; + line-height: 2; + padding: 1rem 0 0 0; +} + +/* Use flexbox to allow items to wrap, as needed */ +header > nav ul, +header > nav ol { + align-content: space-around; + align-items: center; + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: center; + list-style-type: none; + margin: 0; + padding: 0; +} + +/* List items are inline elements, make them behave more like blocks */ +header > nav ul li, +header > nav ol li { + display: inline-block; +} + +header > nav a, +header > nav a:visited { + margin: 0 0.5rem 1rem 0.5rem; + border: 1px solid var(--border); + border-radius: var(--standard-border-radius); + color: var(--text); + display: inline-block; + padding: 0.1rem 1rem; + text-decoration: none; +} + +header > nav a:hover, +header > nav a.current, +header > nav a[aria-current="page"], +header > nav a[aria-current="true"] { + border-color: var(--accent); + color: var(--accent); + cursor: pointer; +} + +/* Reduce nav side on mobile */ +@media only screen and (max-width: 720px) { + header > nav a { + border: none; + padding: 0; + text-decoration: underline; + line-height: 1; + } +} + +/* Consolidate box styling */ +aside, details, pre, progress { + background-color: var(--accent-bg); + border: 1px solid var(--border); + border-radius: var(--standard-border-radius); + margin-bottom: 1rem; +} + +aside { + font-size: 1rem; + width: 30%; + padding: 0 15px; + margin-inline-start: 15px; + float: right; +} +*[dir="rtl"] aside { + float: left; +} + +/* Make aside full-width on mobile */ +@media only screen and (max-width: 720px) { + aside { width: 100%; - height: 100%; - background: linear-gradient(180deg, rgba(0, 0, 0, 0.9) 0%, rgba(0, 0, 0, 0.4) 50%, rgba(0, 0, 0, 0.9) 100%); -} - -.hero-text { - position: relative; - z-index: 2; - text-align: center; - color: white; - animation: fadeIn 1.5s ease-in-out; -} - - .hero-text h1 { - font-size: 4em; - font-weight: bold; - text-transform: uppercase; - } - - .hero-text h2 { - margin-top: 0.5em; - font-size: 1.8em; - } - -.cta-button, .login-button { - margin-top: 20px; - font-size: 1.2em; - display: inline-block; - padding: 15px 30px; - text-transform: uppercase; - color: #FBFF00; - border: 2px solid #FBFF00; - text-shadow: 0 0 0.125em #FBFF00, 0 0 0.45em currentColor; - border-radius: 35px; - transition: background-color 0.3s, border-color 0.3s; -} - - .cta-button:hover, .login-button:hover { - background-color: #FF8C00; - color: white; - border-color: #FF8C00; - } - -.scroll-indicator { - position: absolute; - bottom: 10%; - animation: bounce 2s infinite; -} - -.scroll-arrow i { - font-size: 2em; - color: white; -} - -/* About Section */ -.about-section { - margin-top: 50px; - padding: 50px 20px; - background: #202c42; - color: white; - border-radius: 10px; - box-shadow: 0px 4px 15px rgba(0, 0, 0, 0.3); -} - - .about-section h2 { - font-size: 2.5em; - color: #FFD700; - margin-bottom: 20px; - } - -.feature-card { - background: #000235; - padding: 20px; - border-radius: 10px; - text-align: center; - transition: transform 0.3s, box-shadow 0.3s; -} - - .feature-card:hover { - transform: translateY(-5px); - box-shadow: 0px 4px 15px rgba(0, 0, 0, 0.3); - } - - .feature-card i { - font-size: 2.5em; - color: #FFD700; - margin-bottom: 10px; - } - - .feature-card h5 { - color: white; - } - -/* Footer */ -.footer { - margin-top: auto; - padding: 20px 0; - text-align: center; - border-top: 1px solid #333; - background-color: #000235; - color: white; -} - - .footer a { - color: #FFD700; - } - - .footer a:hover { - color: #FFA500; - } - -/* Keyframes for animations */ -@keyframes fadeIn { - from { - opacity: 0; - transform: translateY(-10px); - } - - to { - opacity: 1; - transform: translateY(0); - } -} - -@keyframes bounce { - 0%, 100% { - transform: translateY(0); - } - - 50% { - transform: translateY(-10px); - } + float: none; + margin-inline-start: 0; + } } + +article, fieldset, dialog { + border: 1px solid var(--border); + padding: 1rem; + border-radius: var(--standard-border-radius); + margin-bottom: 1rem; +} + +article h2:first-child, +section h2:first-child, +article h3:first-child, +section h3:first-child { + margin-top: 1rem; +} + +section { + border-top: 1px solid var(--border); + border-bottom: 1px solid var(--border); + padding: 2rem 1rem; + margin: 3rem 0; +} + +/* Don't double separators when chaining sections */ +section + section, +section:first-child { + border-top: 0; + padding-top: 0; +} + +section + section { + margin-top: 0; +} + +section:last-child { + border-bottom: 0; + padding-bottom: 0; +} + +details { + padding: 0.7rem 1rem; +} + +summary { + cursor: pointer; + font-weight: bold; + padding: 0.7rem 1rem; + margin: -0.7rem -1rem; + word-break: break-all; +} + +details[open] > summary + * { + margin-top: 0; +} + +details[open] > summary { + margin-bottom: 0.5rem; +} + +details[open] > :last-child { + margin-bottom: 0; +} + +/* Format tables */ +table { + border-collapse: collapse; + margin: 1.5rem 0; +} + +figure > table { + width: max-content; + margin: 0; +} + +td, +th { + border: 1px solid var(--border); + text-align: start; + padding: 0.5rem; +} + +th { + background-color: var(--accent-bg); + font-weight: bold; +} + +tr:nth-child(even) { + /* Set every other cell slightly darker. Improves readability. */ + background-color: var(--accent-bg); +} + +table caption { + font-weight: bold; + margin-bottom: 0.5rem; +} + +/* Format forms */ +textarea, +select, +input, +button, +.button { + font-size: inherit; + font-family: inherit; + padding: 0.5rem; + margin-bottom: 0.5rem; + border-radius: var(--standard-border-radius); + box-shadow: none; + max-width: 100%; + display: inline-block; +} +textarea, +select, +input { + color: var(--text); + background-color: var(--bg); + border: 1px solid var(--border); +} +label { + display: block; +} +textarea:not([cols]) { + width: 100%; +} + +/* Add arrow to drop-down */ +select:not([multiple]) { + background-image: linear-gradient(45deg, transparent 49%, var(--text) 51%), + linear-gradient(135deg, var(--text) 51%, transparent 49%); + background-position: calc(100% - 15px), calc(100% - 10px); + background-size: 5px 5px, 5px 5px; + background-repeat: no-repeat; + padding-inline-end: 25px; +} +*[dir="rtl"] select:not([multiple]) { + background-position: 10px, 15px; +} + +/* checkbox and radio button style */ +input[type="checkbox"], +input[type="radio"] { + vertical-align: middle; + position: relative; + width: min-content; +} + +input[type="checkbox"] + label, +input[type="radio"] + label { + display: inline-block; +} + +input[type="radio"] { + border-radius: 100%; +} + +input[type="checkbox"]:checked, +input[type="radio"]:checked { + background-color: var(--accent); +} + +input[type="checkbox"]:checked::after { + /* Creates a rectangle with colored right and bottom borders which is rotated to look like a check mark */ + content: " "; + width: 0.18em; + height: 0.32em; + border-radius: 0; + position: absolute; + top: 0.05em; + left: 0.17em; + background-color: transparent; + border-right: solid var(--bg) 0.08em; + border-bottom: solid var(--bg) 0.08em; + font-size: 1.8em; + transform: rotate(45deg); +} +input[type="radio"]:checked::after { + /* creates a colored circle for the checked radio button */ + content: " "; + width: 0.25em; + height: 0.25em; + border-radius: 100%; + position: absolute; + top: 0.125em; + background-color: var(--bg); + left: 0.125em; + font-size: 32px; +} + +/* Makes input fields wider on smaller screens */ +@media only screen and (max-width: 720px) { + textarea, + select, + input { + width: 100%; + } +} + +/* Set a height for color input */ +input[type="color"] { + height: 2.5rem; + padding: 0.2rem; +} + +/* do not show border around file selector button */ +input[type="file"] { + border: 0; +} + +/* Misc body elements */ +hr { + border: none; + height: 1px; + background: var(--border); + margin: 1rem auto; +} + +mark { + padding: 2px 5px; + border-radius: var(--standard-border-radius); + background-color: var(--marked); + color: black; +} + +mark a { + color: #0d47a1; +} + +img, +video { + max-width: 100%; + height: auto; + border-radius: var(--standard-border-radius); +} + +figure { + margin: 0; + display: block; + overflow-x: auto; +} + +figure > img, +figure > picture > img { + display: block; + margin-inline: auto; +} + +figcaption { + text-align: center; + font-size: 0.9rem; + color: var(--text-light); + margin-block: 1rem; +} + +blockquote { + margin-inline-start: 2rem; + margin-inline-end: 0; + margin-block: 2rem; + padding: 0.4rem 0.8rem; + border-inline-start: 0.35rem solid var(--accent); + color: var(--text-light); + font-style: italic; +} + +cite { + font-size: 0.9rem; + color: var(--text-light); + font-style: normal; +} + +dt { + color: var(--text-light); +} + +/* Use mono font for code elements */ +code, +pre, +pre span, +kbd, +samp { + font-family: var(--mono-font); + color: var(--code); +} + +kbd { + color: var(--preformatted); + border: 1px solid var(--preformatted); + border-bottom: 3px solid var(--preformatted); + border-radius: var(--standard-border-radius); + padding: 0.1rem 0.4rem; +} + +pre { + padding: 1rem 1.4rem; + max-width: 100%; + overflow: auto; + color: var(--preformatted); +} + +/* Fix embedded code within pre */ +pre code { + color: var(--preformatted); + background: none; + margin: 0; + padding: 0; +} + +/* Progress bars */ +/* Declarations are repeated because you */ +/* cannot combine vendor-specific selectors */ +progress { + width: 100%; +} + +progress:indeterminate { + background-color: var(--accent-bg); +} + +progress::-webkit-progress-bar { + border-radius: var(--standard-border-radius); + background-color: var(--accent-bg); +} + +progress::-webkit-progress-value { + border-radius: var(--standard-border-radius); + background-color: var(--accent); +} + +progress::-moz-progress-bar { + border-radius: var(--standard-border-radius); + background-color: var(--accent); + transition-property: width; + transition-duration: 0.3s; +} + +progress:indeterminate::-moz-progress-bar { + background-color: var(--accent-bg); +} + +dialog { + max-width: 40rem; + margin: auto; +} + +dialog::backdrop { + background-color: var(--bg); + opacity: 0.8; +} + +@media only screen and (max-width: 720px) { + dialog { + max-width: 100%; + margin: auto 1em; + } +} + +/* Superscript & Subscript */ +/* Prevent scripts from affecting line-height. */ +sup, sub { + vertical-align: baseline; + position: relative; +} + +sup { + top: -0.4em; +} + +sub { + top: 0.3em; +} + +/* Classes for notices */ +.notice { + background: var(--accent-bg); + border: 2px solid var(--border); + border-radius: var(--standard-border-radius); + padding: 1.5rem; + margin: 2rem 0; +} \ No newline at end of file diff --git a/GameLibrary/wwwroot/js/games/details.js b/GameLibrary/wwwroot/js/games/details.js deleted file mode 100644 index f1a8bda..0000000 --- a/GameLibrary/wwwroot/js/games/details.js +++ /dev/null @@ -1,107 +0,0 @@ -// Game Details Page JavaScript - -document.addEventListener('DOMContentLoaded', function () { - initializeStarRating(); - setupReviewForm(); -}); - -// Initialize star rating system -function initializeStarRating() { - const ratingInputs = document.querySelectorAll('.rating-input input[type="radio"]'); - const ratingLabels = document.querySelectorAll('.rating-input label'); - - ratingLabels.forEach(label => { - // Replace the default star with a filled star when selected - label.addEventListener('click', function () { - const input = document.querySelector(`#${this.getAttribute('for')}`); - const rating = input.value; - updateStars(rating); - }); - }); - - function updateStars(rating) { - ratingLabels.forEach(label => { - const star = label.querySelector('i'); - const starValue = label.getAttribute('for').replace('star', ''); - - if (starValue <= rating) { - star.classList.remove('far'); - star.classList.add('fas'); - } else { - star.classList.remove('fas'); - star.classList.add('far'); - } - }); - } -} - -// Setup review form submission -function setupReviewForm() { - const form = document.querySelector('.add-review form'); - if (!form) return; - - // Add client-side validation - form.addEventListener('submit', function (e) { - const rating = form.querySelector('input[name="rating"]:checked'); - const comment = form.querySelector('textarea[name="comment"]'); - - if (!rating) { - e.preventDefault(); - alert('Please select a rating'); - return; - } - - if (!comment.value.trim()) { - e.preventDefault(); - alert('Please write a review comment'); - return; - } - }); -} - -// HTMX after swap event handler -document.addEventListener('htmx:afterSwap', function (event) { - if (event.detail.target.classList.contains('game-reviews')) { - // Reinitialize any JavaScript components in the reviews section - // This runs after HTMX updates the reviews content - } -}); - -// Add loading indicator for HTMX requests -document.addEventListener('htmx:beforeRequest', function (event) { - const target = event.detail.target; - if (target.classList.contains('game-reviews')) { - target.innerHTML = '
      Loading reviews...
      '; - } -}); - -// Handle HTMX request errors -document.addEventListener('htmx:responseError', function (event) { - const target = event.detail.target; - if (target.classList.contains('game-reviews')) { - target.innerHTML = '
      Error loading reviews. Please try again later.
      '; - } -}); - -// Smooth scroll to reviews section when adding a new review -document.addEventListener('htmx:afterSettle', function (event) { - if (event.detail.target.id === 'reviews-list') { - event.detail.target.scrollIntoView({ behavior: 'smooth' }); - } -}); - -// Add animation when new reviews are loaded -document.addEventListener('htmx:afterSwap', function (event) { - if (event.detail.target.classList.contains('reviews-list')) { - const reviews = event.detail.target.querySelectorAll('.review-item'); - reviews.forEach((review, index) => { - review.style.opacity = '0'; - review.style.transform = 'translateY(20px)'; - setTimeout(() => { - review.style.transition = 'opacity 0.5s ease, transform 0.5s ease'; - review.style.opacity = '1'; - review.style.transform = 'translateY(0)'; - }, index * 100); - }); - } -}); diff --git a/GameLibrary/wwwroot/js/games/library.js b/GameLibrary/wwwroot/js/games/library.js deleted file mode 100644 index 53676fd..0000000 --- a/GameLibrary/wwwroot/js/games/library.js +++ /dev/null @@ -1,94 +0,0 @@ -document.addEventListener('DOMContentLoaded', function() { - // Filter buttons - const filterButtons = document.querySelectorAll('[data-filter]'); - filterButtons.forEach(button => { - button.addEventListener('click', function() { - // Remove active class from all buttons - filterButtons.forEach(btn => btn.classList.remove('active')); - // Add active class to clicked button - this.classList.add('active'); - - const filter = this.dataset.filter; - filterGames(filter); - }); - }); - - // Upcoming games filter - const upcomingFilter = document.getElementById('upcomingFilter'); - upcomingFilter.addEventListener('change', function() { - const activeFilter = document.querySelector('[data-filter].active').dataset.filter; - filterGames(activeFilter); - }); - - // Status update dropdown items - document.querySelectorAll('.dropdown-item[data-status]').forEach(item => { - item.addEventListener('click', async function(e) { - e.preventDefault(); - const gameId = this.dataset.gameId; - const status = this.dataset.status; - - try { - const response = await fetch('/Games/Library?handler=UpdateStatus', { - method: 'POST', - headers: { - 'Content-Type': 'application/x-www-form-urlencoded', - 'RequestVerificationToken': document.querySelector('input[name="__RequestVerificationToken"]').value - }, - body: `gameId=${gameId}&status=${status}` - }); - - if (response.ok) { - window.location.reload(); - } else { - console.error('Failed to update status'); - } - } catch (error) { - console.error('Error:', error); - } - }); - }); - - // Remove game buttons - document.querySelectorAll('button[data-game-id]').forEach(button => { - button.addEventListener('click', async function() { - if (confirm('Are you sure you want to remove this game from your library?')) { - const gameId = this.dataset.gameId; - - try { - const response = await fetch('/Games/Library?handler=Remove', { - method: 'POST', - headers: { - 'Content-Type': 'application/x-www-form-urlencoded', - 'RequestVerificationToken': document.querySelector('input[name="__RequestVerificationToken"]').value - }, - body: `gameId=${gameId}` - }); - - if (response.ok) { - const libraryItem = this.closest('.library-item'); - libraryItem.remove(); - } else { - console.error('Failed to remove game'); - } - } catch (error) { - console.error('Error:', error); - } - } - }); - }); -}); - -function filterGames(filter) { - const showUpcoming = document.getElementById('upcomingFilter').checked; - const items = document.querySelectorAll('.library-item'); - - items.forEach(item => { - const status = item.dataset.status; - const isUpcoming = item.dataset.upcoming === 'true'; - - const matchesFilter = filter === 'all' || status === filter; - const matchesUpcoming = !showUpcoming || isUpcoming; - - item.style.display = matchesFilter && matchesUpcoming ? 'block' : 'none'; - }); -} diff --git a/GameLibrary/wwwroot/js/site.js b/GameLibrary/wwwroot/js/site.js index 0937657..d3b693e 100644 --- a/GameLibrary/wwwroot/js/site.js +++ b/GameLibrary/wwwroot/js/site.js @@ -1,4 +1,8 @@ -// Please see documentation at https://learn.microsoft.com/aspnet/core/client-side/bundling-and-minification -// for details on configuring this project to bundle and minify static web assets. - -// Write your JavaScript code. +function previewImage(event) { + const files = event.target.files; + if (files.length > 0) { + const preview = document.getElementById('imagePreview'); + preview.src = URL.createObjectURL(files[0]); + preview.style.display = 'block'; + } +} From 6d9ebb34ee9bad8b9c43af4f73cd780cd566da42 Mon Sep 17 00:00:00 2001 From: Mathias Date: Tue, 19 Nov 2024 08:56:23 +0100 Subject: [PATCH 04/19] Server-Side Filtering Moved filtering to server-side, as the data is already queried from the database Updated colors to match current color-scheme --- GameLibrary/Pages/Account/Library.cshtml | 53 ++++++--------------- GameLibrary/Pages/Account/Library.cshtml.cs | 47 +++++++----------- GameLibrary/Pages/Games/Index.cshtml | 2 +- GameLibrary/wwwroot/css/site.css | 46 +++++++++--------- 4 files changed, 58 insertions(+), 90 deletions(-) diff --git a/GameLibrary/Pages/Account/Library.cshtml b/GameLibrary/Pages/Account/Library.cshtml index 6ab1598..f508961 100644 --- a/GameLibrary/Pages/Account/Library.cshtml +++ b/GameLibrary/Pages/Account/Library.cshtml @@ -1,29 +1,33 @@ @page @model LibraryModel @{ - ViewData["Title"] = "My Game Library"; + ViewData["Title"] = "Library"; }

      My Game Library

      +
      -
      - - - - - - -
      +
      +
      + + + + + + +
      +
      +
      @foreach (var item in Model.LibraryItems) { -
      +
      @item.Game.Title
      @@ -77,34 +81,7 @@
      + @section Styles { } - -@section Scripts { - -} diff --git a/GameLibrary/Pages/Account/Library.cshtml.cs b/GameLibrary/Pages/Account/Library.cshtml.cs index 2e3815a..db35f73 100644 --- a/GameLibrary/Pages/Account/Library.cshtml.cs +++ b/GameLibrary/Pages/Account/Library.cshtml.cs @@ -27,13 +27,11 @@ public class LibraryModel : PageModel { private readonly ApplicationDbContext _context; private readonly UserManager _userManager; - private readonly ILogger _logger; - public LibraryModel(ApplicationDbContext context, UserManager userManager, ILogger logger) + public LibraryModel(ApplicationDbContext context, UserManager userManager) { _context = context; _userManager = userManager; - _logger = logger; } public class LibraryItemViewModel @@ -45,8 +43,9 @@ public class LibraryItemViewModel } public List LibraryItems { get; set; } = []; + public string Filter { get; set; } = "all"; - public async Task OnGetAsync() + public async Task OnGetAsync(string? filter) { var user = await _userManager.GetUserAsync(User); if (user == null) @@ -54,11 +53,21 @@ public async Task OnGetAsync() return NotFound(); } + // Default filter + Filter = filter ?? "all"; + // Get user's library items with related game data - var libraryItems = await _context.UserLibraries + var libraryItemsQuery = _context.UserLibraries .Include(ul => ul.Game) - .Where(ul => ul.UserId == user.Id) - .ToListAsync(); + .Where(ul => ul.UserId == user.Id); + + // Apply filter if necessary + if (Filter != "all") + { + libraryItemsQuery = libraryItemsQuery.Where(ul => ul.Status == Filter); + } + + var libraryItems = await libraryItemsQuery.ToListAsync(); // Get user's favorites var favorites = await _context.UserFavorites @@ -73,34 +82,14 @@ public async Task OnGetAsync() .ToDictionaryAsync(g => g.Key, g => g.OrderByDescending(r => r.CreatedAt).First().Rating); // Build view models - LibraryItems = libraryItems.Select(li => new LibraryItemViewModel + LibraryItems = libraryItems.ConvertAll(li => new LibraryItemViewModel { Game = li.Game, Status = li.Status, IsFavorite = favorites.Contains(li.GameId), Rating = ratings.GetValueOrDefault(li.GameId) - }).ToList(); + }); return Page(); } - - public async Task OnPostUpdateStatusAsync(Guid gameId, string status) - { - var user = await _userManager.GetUserAsync(User); - if (user == null) - { - return NotFound(); - } - - var libraryItem = await _context.UserLibraries - .FirstOrDefaultAsync(ul => ul.UserId == user.Id && ul.GameId == gameId); - - if (libraryItem != null) - { - libraryItem.Status = status; - await _context.SaveChangesAsync(); - } - - return RedirectToPage(); - } } diff --git a/GameLibrary/Pages/Games/Index.cshtml b/GameLibrary/Pages/Games/Index.cshtml index 92e3975..93f3bdb 100644 --- a/GameLibrary/Pages/Games/Index.cshtml +++ b/GameLibrary/Pages/Games/Index.cshtml @@ -1,7 +1,7 @@ @page @model GameLibrary.Pages.Games.IndexModel @{ - ViewData["Title"] = "Welcome to GAMELIB"; + ViewData["Title"] = "Games"; }
      diff --git a/GameLibrary/wwwroot/css/site.css b/GameLibrary/wwwroot/css/site.css index 5781e8b..9c3b64e 100644 --- a/GameLibrary/wwwroot/css/site.css +++ b/GameLibrary/wwwroot/css/site.css @@ -8,18 +8,18 @@ --standard-border-radius: 6px; /* Light theme colors */ - --bg: #ffffff; - --accent-bg: #f3f3f3; - --text: #1f1f1f; - --text-light: #606060; - --border: #d1d9e1; - --accent: #0078d4; - --accent-hover: #005a9e; - --accent-text: #ffffff; - --code: #d81b60; - --preformatted: #444444; - --marked: #ffcc00; - --disabled: #f7f7f7; + --bg: #000235; + --accent-bg: #420599; + --text: #FFD43B; + --text-light: #FFD43B; + --border: #FFD43B; + --accent: #FFD43B; + --accent-hover: #FFD43B; + --accent-text: #000235; + --code: #FFD43B; + --preformatted: #FFD43B; + --marked: #FFD43B; + --disabled: #FFD43B; } /* Dark theme */ @@ -27,16 +27,18 @@ :root, ::backdrop { color-scheme: dark; - --bg: #1e1e1e; - --accent-bg: #2e2e2e; - --text: #ffffff; - --text-light: #d9d9d9; - --accent: #1a73e8; - --accent-hover: #0c5bbf; + --bg: #000235; + --accent-bg: #420599; + --text: #FFD43B; + --text-light: #FFD43B; + --border: #FFD43B; + --accent: #FFD43B; + --accent-hover: #FFD43B; --accent-text: var(--bg); - --code: #ff7f7f; - --preformatted: #d9d9d9; - --disabled: #444444; + --code: #FFD43B; + --preformatted: #FFD43B; + --marked: #FFD43B; + --disabled: #FFD43B; } /* Add a bit of transparency so light media isn't so glaring in dark mode */ img, @@ -708,4 +710,4 @@ sub { border-radius: var(--standard-border-radius); padding: 1.5rem; margin: 2rem 0; -} \ No newline at end of file +} From adbee0ad736a60c430d5008035bee1d8300a272c Mon Sep 17 00:00:00 2001 From: Mathias Date: Tue, 19 Nov 2024 09:18:46 +0100 Subject: [PATCH 05/19] Prep for Tailwind Fix * Compile warnings Moved * css into files for eventual tailwind transformation --- GameLibrary/Pages/Account/Library.cshtml | 52 +++- GameLibrary/Pages/Admin/Roles/Delete.cshtml | 6 +- GameLibrary/Pages/Admin/Roles/Edit.cshtml.cs | 7 +- GameLibrary/Pages/Admin/Roles/Index.cshtml | 2 +- GameLibrary/Pages/Admin/Users/Create.cshtml | 12 +- .../Pages/Admin/Users/Create.cshtml.cs | 8 +- GameLibrary/Pages/Admin/Users/Delete.cshtml | 10 +- .../Pages/Admin/Users/Delete.cshtml.cs | 12 +- GameLibrary/Pages/Admin/Users/Edit.cshtml | 12 +- GameLibrary/Pages/Admin/Users/Edit.cshtml.cs | 4 +- GameLibrary/Pages/Admin/Users/Index.cshtml | 2 +- GameLibrary/Pages/Admin/Users/Index.cshtml.cs | 4 +- GameLibrary/wwwroot/css/games/details.css | 294 ------------------ GameLibrary/wwwroot/css/games/library.css | 39 --- GameLibrary/wwwroot/css/user/library.css | 47 --- 15 files changed, 89 insertions(+), 422 deletions(-) delete mode 100644 GameLibrary/wwwroot/css/games/details.css delete mode 100644 GameLibrary/wwwroot/css/games/library.css delete mode 100644 GameLibrary/wwwroot/css/user/library.css diff --git a/GameLibrary/Pages/Account/Library.cshtml b/GameLibrary/Pages/Account/Library.cshtml index f508961..ad99405 100644 --- a/GameLibrary/Pages/Account/Library.cshtml +++ b/GameLibrary/Pages/Account/Library.cshtml @@ -82,6 +82,52 @@
      -@section Styles { - -} + diff --git a/GameLibrary/Pages/Admin/Roles/Delete.cshtml b/GameLibrary/Pages/Admin/Roles/Delete.cshtml index 1f19f10..df11dd5 100644 --- a/GameLibrary/Pages/Admin/Roles/Delete.cshtml +++ b/GameLibrary/Pages/Admin/Roles/Delete.cshtml @@ -14,15 +14,15 @@
      - @Html.DisplayNameFor(model => model.Role.Name) + @Html.DisplayNameFor(model => model.Role!.Name)
      - @Html.DisplayFor(model => model.Role.Name) + @Html.DisplayFor(model => model.Role!.Name)
      - + Back to List
      diff --git a/GameLibrary/Pages/Admin/Roles/Edit.cshtml.cs b/GameLibrary/Pages/Admin/Roles/Edit.cshtml.cs index c2a4ba8..467cbfa 100644 --- a/GameLibrary/Pages/Admin/Roles/Edit.cshtml.cs +++ b/GameLibrary/Pages/Admin/Roles/Edit.cshtml.cs @@ -39,12 +39,13 @@ public async Task OnGetAsync(Guid? id) return NotFound(); } - Role = await _context.Roles.FindAsync(id); - - if (Role == null) + var role = await _context.Roles.FindAsync(id); + if (role == null) { return NotFound(); } + + Role = role; return Page(); } diff --git a/GameLibrary/Pages/Admin/Roles/Index.cshtml b/GameLibrary/Pages/Admin/Roles/Index.cshtml index e0b20cd..3622357 100644 --- a/GameLibrary/Pages/Admin/Roles/Index.cshtml +++ b/GameLibrary/Pages/Admin/Roles/Index.cshtml @@ -20,7 +20,7 @@ - @foreach (var role in Model.Roles) + @foreach (var role in Model.Roles!) { @role.Name diff --git a/GameLibrary/Pages/Admin/Users/Create.cshtml b/GameLibrary/Pages/Admin/Users/Create.cshtml index 781c0f1..6dd8fbe 100644 --- a/GameLibrary/Pages/Admin/Users/Create.cshtml +++ b/GameLibrary/Pages/Admin/Users/Create.cshtml @@ -17,15 +17,15 @@
      - - - + + +
      - - - + + +
      diff --git a/GameLibrary/Pages/Admin/Users/Create.cshtml.cs b/GameLibrary/Pages/Admin/Users/Create.cshtml.cs index 116f61f..1790f53 100644 --- a/GameLibrary/Pages/Admin/Users/Create.cshtml.cs +++ b/GameLibrary/Pages/Admin/Users/Create.cshtml.cs @@ -33,7 +33,7 @@ public CreateModel(ApplicationDbContext context, UserManager userManager) public IActionResult OnGet() { - User = new User + IdentityUser = new User { UserName = "", Email = "", @@ -43,7 +43,7 @@ public IActionResult OnGet() } [BindProperty] - public User? User { get; set; } + public User? IdentityUser { get; set; } [BindProperty] public string? Password { get; set; } @@ -57,8 +57,8 @@ public async Task OnPostAsync() var user = new User { - UserName = User!.UserName, - Email = User.Email, + UserName = IdentityUser!.UserName, + Email = IdentityUser.Email, CreatedAt = DateTime.UtcNow }; diff --git a/GameLibrary/Pages/Admin/Users/Delete.cshtml b/GameLibrary/Pages/Admin/Users/Delete.cshtml index 44e7c20..b3ad43f 100644 --- a/GameLibrary/Pages/Admin/Users/Delete.cshtml +++ b/GameLibrary/Pages/Admin/Users/Delete.cshtml @@ -16,16 +16,16 @@
      - @Html.DisplayNameFor(model => model.User!.UserName) + @Html.DisplayNameFor(model => model.IdentityUser!.UserName)
      - @Html.DisplayFor(model => model.User!.UserName) + @Html.DisplayFor(model => model.IdentityUser!.UserName)
      - @Html.DisplayNameFor(model => model.User!.Email) + @Html.DisplayNameFor(model => model.IdentityUser!.Email)
      - @Html.DisplayFor(model => model.User!.Email) + @Html.DisplayFor(model => model.IdentityUser!.Email)
      @@ -33,7 +33,7 @@
      - + Back to List
      diff --git a/GameLibrary/Pages/Admin/Users/Delete.cshtml.cs b/GameLibrary/Pages/Admin/Users/Delete.cshtml.cs index 2244f48..027df6e 100644 --- a/GameLibrary/Pages/Admin/Users/Delete.cshtml.cs +++ b/GameLibrary/Pages/Admin/Users/Delete.cshtml.cs @@ -33,7 +33,7 @@ public DeleteModel(ApplicationDbContext context, UserManager userManager) } [BindProperty] - public User? User { get; set; } + public User? IdentityUser { get; set; } public async Task OnGetAsync(Guid? id) { @@ -42,9 +42,9 @@ public async Task OnGetAsync(Guid? id) return NotFound(); } - User = await _userManager.Users.FirstOrDefaultAsync(u => u.Id == id); + IdentityUser = await _userManager.Users.FirstOrDefaultAsync(u => u.Id == id); - if (User == null) + if (IdentityUser == null) { return NotFound(); } @@ -59,11 +59,11 @@ public async Task OnPostAsync(Guid? id) return NotFound(); } - User = await _userManager.Users.FirstOrDefaultAsync(u => u.Id == id); + IdentityUser = await _userManager.Users.FirstOrDefaultAsync(u => u.Id == id); - if (User != null) + if (IdentityUser != null) { - var result = await _userManager.DeleteAsync(User); + var result = await _userManager.DeleteAsync(IdentityUser); if (result.Succeeded) { diff --git a/GameLibrary/Pages/Admin/Users/Edit.cshtml b/GameLibrary/Pages/Admin/Users/Edit.cshtml index f7c13b1..8fca546 100644 --- a/GameLibrary/Pages/Admin/Users/Edit.cshtml +++ b/GameLibrary/Pages/Admin/Users/Edit.cshtml @@ -17,15 +17,15 @@
      - - - + + +
      - - - + + +
      diff --git a/GameLibrary/Pages/Admin/Users/Edit.cshtml.cs b/GameLibrary/Pages/Admin/Users/Edit.cshtml.cs index 74be906..9383b7f 100644 --- a/GameLibrary/Pages/Admin/Users/Edit.cshtml.cs +++ b/GameLibrary/Pages/Admin/Users/Edit.cshtml.cs @@ -33,7 +33,7 @@ public EditModel(ApplicationDbContext context, UserManager userManager) } [BindProperty] - public User? User { get; set; } + public User? IdentityUser { get; set; } [BindProperty] public string? Password { get; set; } @@ -45,7 +45,7 @@ public async Task OnGetAsync(Guid? id) return NotFound(); } - User = await _userManager.Users.FirstOrDefaultAsync(u => u.Id == id); + IdentityUser = await _userManager.Users.FirstOrDefaultAsync(u => u.Id == id); if (User == null) { diff --git a/GameLibrary/Pages/Admin/Users/Index.cshtml b/GameLibrary/Pages/Admin/Users/Index.cshtml index e5796c4..975dafd 100644 --- a/GameLibrary/Pages/Admin/Users/Index.cshtml +++ b/GameLibrary/Pages/Admin/Users/Index.cshtml @@ -24,7 +24,7 @@ - @foreach (var item in Model.Users!) + @foreach (var item in Model.IdentityUsers!) { @Html.DisplayFor(modelItem => item.UserName) diff --git a/GameLibrary/Pages/Admin/Users/Index.cshtml.cs b/GameLibrary/Pages/Admin/Users/Index.cshtml.cs index 23cd227..13c2b93 100644 --- a/GameLibrary/Pages/Admin/Users/Index.cshtml.cs +++ b/GameLibrary/Pages/Admin/Users/Index.cshtml.cs @@ -28,10 +28,10 @@ public IndexModel(ApplicationDbContext context) _context = context; } - public IList? Users { get; set; } + public IList? IdentityUsers { get; set; } public async Task OnGetAsync() { - Users = await _context.Users.ToListAsync(); + IdentityUsers = await _context.Users.ToListAsync(); } } diff --git a/GameLibrary/wwwroot/css/games/details.css b/GameLibrary/wwwroot/css/games/details.css deleted file mode 100644 index 414fb4a..0000000 --- a/GameLibrary/wwwroot/css/games/details.css +++ /dev/null @@ -1,294 +0,0 @@ -/* Game Details Page Styles */ -.game-details-container { - max-width: 1200px; - margin: 0 auto; - padding: 2rem; - font-family: 'Segoe UI', system-ui, -apple-system, sans-serif; -} - -/* Game Header Section */ -.game-header { - background-color: var(--bs-primary-bg-subtle); - border-radius: 0.5rem; - padding: 2rem; - margin-bottom: 2rem; - color: #ffffff; - box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1); -} - -.game-cover { - width: 100%; - max-width: 300px; - height: auto; - border-radius: 0.5rem; - margin-bottom: 1rem; - object-fit: cover; - box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1); -} - -.game-info { - flex: 1; - display: flex; - flex-direction: column; - gap: 1rem; -} - -.game-info h1 { - font-size: 2.5rem; - margin: 0; - margin-bottom: 1rem; - color: var(--bs-warning); - text-shadow: 2px 2px 4px rgba(0, 0, 0, 0.3); -} - -.game-meta { - display: flex; - flex-wrap: wrap; - gap: 1rem; - font-size: 0.9rem; - margin-bottom: 1.5rem; -} - -.game-meta span { - background-color: var(--bs-primary); - color: white; - padding: 0.25rem 0.75rem; - border-radius: 1rem; - font-size: 0.9rem; -} - -.game-actions { - display: flex; - gap: 1rem; - flex-wrap: wrap; - margin: 1.5rem 0; -} - -/* Rating Section */ -.rating { - display: flex; - align-items: center; - gap: 1rem; - margin-top: auto; - font-size: 1.5rem; - margin-bottom: 1rem; -} - -.stars { - color: #ffc107; - font-size: 1.5rem; - margin-right: 0.5rem; -} - -.rating-value { - font-size: 1.25rem; - font-weight: bold; - color: white; - margin-left: 0.5rem; -} - -/* Game Description */ -.game-description { - background: #ffffff; - padding: 2rem; - border-radius: 1rem; - margin-bottom: 2rem; - box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05); -} - -.game-description h2 { - color: #333; - margin-top: 0; - margin-bottom: 1rem; - font-size: 1.5rem; -} - -.game-description p { - color: #666; - line-height: 1.6; - margin: 0; -} - -/* Reviews Section */ -.game-reviews { - background: #ffffff; - padding: 2rem; - border-radius: 1rem; - box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05); - margin-top: 2rem; -} - -.reviews-list { - display: flex; - flex-direction: column; - gap: 1.5rem; -} - -.review-item { - border-bottom: 1px solid #eee; - padding-bottom: 1.5rem; -} - -.review-item:last-child { - border-bottom: none; - padding-bottom: 0; -} - -.review-header { - display: flex; - justify-content: space-between; - align-items: center; - margin-bottom: 1rem; -} - -.reviewer-info { - display: flex; - align-items: center; - gap: 0.75rem; -} - -.reviewer-avatar, -.reviewer-avatar-placeholder { - width: 40px; - height: 40px; - border-radius: 50%; - background: #f0f0f0; - display: flex; - align-items: center; - justify-content: center; -} - -.reviewer-name { - font-weight: 500; - color: #333; -} - -.review-rating { - color: #ffd700; -} - -.review-content { - color: #666; - line-height: 1.6; -} - -.review-footer { - margin-top: 0.75rem; - font-size: 0.875rem; - color: #999; -} - -/* Add Review Form */ -.add-review { - background: #f8f9fa; - padding: 1.5rem; - border-radius: 8px; - margin-top: 2rem; - box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05); -} - -.add-review h3 { - margin-top: 0; - margin-bottom: 1.5rem; - color: #333; -} - -.rating-input { - display: flex; - flex-direction: row-reverse; - gap: 0.25rem; - margin-bottom: 1rem; -} - -.star-label { - cursor: pointer; - font-size: 1.5rem; -} - -.star-label:hover i, -.star-label:hover ~ label i, -input[type="radio"]:checked ~ label i { - color: var(--bs-warning); - font-weight: 900; -} - -.add-review textarea { - width: 100%; - min-height: 100px; - padding: 0.5rem; - border: 1px solid #dee2e6; - border-radius: 4px; - margin-bottom: 1rem; - resize: vertical; - transition: border-color 0.2s ease-in-out; -} - -.add-review textarea:focus { - outline: none; - border-color: #007bff; -} - -.btn-primary { - background: linear-gradient(145deg, #007bff, #0056b3); - color: #ffffff; - border: none; - padding: 0.75rem 1.5rem; - border-radius: 0.5rem; - cursor: pointer; - font-weight: 500; - transition: transform 0.2s, box-shadow 0.2s; -} - -.btn-primary:hover { - transform: translateY(-2px); - box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1); -} - -/* Loading State */ -.loading { - text-align: center; - padding: 2rem; - color: #666; -} - -/* Responsive Design */ -@media (max-width: 768px) { - .game-header { - flex-direction: column; - } - - .game-cover { - width: 100%; - height: auto; - max-height: 400px; - } - - .game-meta { - justify-content: center; - } - - .rating { - justify-content: center; - } -} - -/* Status dropdown styles */ -.dropdown-menu { - background-color: var(--bs-primary-bg-subtle); - border-color: var(--bs-primary); -} - -.dropdown-item { - color: white; -} - -.dropdown-item:hover, -.dropdown-item:focus { - background-color: var(--bs-primary); - color: white; -} - -.dropdown-item.active { - background-color: var(--bs-primary); - color: white; -} diff --git a/GameLibrary/wwwroot/css/games/library.css b/GameLibrary/wwwroot/css/games/library.css deleted file mode 100644 index 3a641c5..0000000 --- a/GameLibrary/wwwroot/css/games/library.css +++ /dev/null @@ -1,39 +0,0 @@ -.library-item { - transition: transform 0.2s ease-in-out; -} - -.library-item:hover { - transform: translateY(-5px); -} - -.card-img-top { - height: 200px; - object-fit: cover; -} - -.badge { - font-size: 0.9rem; - padding: 0.5em 1em; -} - -.btn-group .btn { - transition: all 0.2s ease-in-out; -} - -.dropdown-menu { - min-width: 200px; -} - -.dropdown-item { - padding: 0.5rem 1rem; - transition: background-color 0.2s ease-in-out; -} - -.dropdown-item:hover { - background-color: #f8f9fa; -} - -.form-check-input:checked { - background-color: #0d6efd; - border-color: #0d6efd; -} diff --git a/GameLibrary/wwwroot/css/user/library.css b/GameLibrary/wwwroot/css/user/library.css deleted file mode 100644 index 59686d7..0000000 --- a/GameLibrary/wwwroot/css/user/library.css +++ /dev/null @@ -1,47 +0,0 @@ -.game-item .card { - transition: transform 0.2s; -} - -.game-item .card:hover { - transform: translateY(-5px); -} - -.rating { - margin-top: 0.5rem; -} - -.rating .fa-star { - color: #ffc107; -} - -.btn-group .btn { - transition: all 0.2s; -} - -.btn-group .btn:hover { - transform: translateY(-2px); -} - -.badge { - margin-right: 0.5rem; -} - -.dropdown-item.active { - background-color: var(--bs-primary); - color: white; -} - -/* Filter buttons */ -.btn-group[role="group"] .btn { - border-radius: 0; -} - -.btn-group[role="group"] .btn:first-child { - border-top-left-radius: 0.375rem; - border-bottom-left-radius: 0.375rem; -} - -.btn-group[role="group"] .btn:last-child { - border-top-right-radius: 0.375rem; - border-bottom-right-radius: 0.375rem; -} From 5d284d16281e06cfc7756a17cdaeecad0ed12257 Mon Sep 17 00:00:00 2001 From: Mathias Date: Tue, 19 Nov 2024 09:34:22 +0100 Subject: [PATCH 06/19] Undo site.css Base style will be changed when/if bootstrap is replaced with tailwind, but only then. (Should be its own branch too) --- GameLibrary/wwwroot/css/site.css | 864 ++++++------------------------- 1 file changed, 171 insertions(+), 693 deletions(-) diff --git a/GameLibrary/wwwroot/css/site.css b/GameLibrary/wwwroot/css/site.css index 9c3b64e..19e4fdd 100644 --- a/GameLibrary/wwwroot/css/site.css +++ b/GameLibrary/wwwroot/css/site.css @@ -1,713 +1,191 @@ -/* Based on Simple.css by Andy Bell and windows 11 inspired */ -/* Global variables. */ -:root, -::backdrop { - /* Set sans-serif & mono fonts */ - --sans-font: -apple-system, BlinkMacSystemFont, "Segoe UI", "Noto Sans", "Roboto", "Arial", sans-serif; - --mono-font: Consolas, "Courier New", Menlo, Monaco, "Ubuntu Mono", monospace; - --standard-border-radius: 6px; - - /* Light theme colors */ - --bg: #000235; - --accent-bg: #420599; - --text: #FFD43B; - --text-light: #FFD43B; - --border: #FFD43B; - --accent: #FFD43B; - --accent-hover: #FFD43B; - --accent-text: #000235; - --code: #FFD43B; - --preformatted: #FFD43B; - --marked: #FFD43B; - --disabled: #FFD43B; -} - -/* Dark theme */ -@media (prefers-color-scheme: dark) { - :root, - ::backdrop { - color-scheme: dark; - --bg: #000235; - --accent-bg: #420599; - --text: #FFD43B; - --text-light: #FFD43B; - --border: #FFD43B; - --accent: #FFD43B; - --accent-hover: #FFD43B; - --accent-text: var(--bg); - --code: #FFD43B; - --preformatted: #FFD43B; - --marked: #FFD43B; - --disabled: #FFD43B; - } - /* Add a bit of transparency so light media isn't so glaring in dark mode */ - img, - video { - opacity: 0.8; - } -} - -/* Reset box-sizing */ -*, *::before, *::after { - box-sizing: border-box; -} - -/* Reset default appearance */ -textarea, -select, -input, -progress { - appearance: none; - -webkit-appearance: none; - -moz-appearance: none; -} - -html { - /* Set the font globally */ - font-family: var(--sans-font); - scroll-behavior: smooth; -} - -/* Make the body a nice central block */ +/* Site-wide styles */ body { - color: var(--text); - background-color: var(--bg); - font-size: 1.15rem; - line-height: 1.5; - display: grid; - grid-template-columns: 1fr min(45rem, 90%) 1fr; - margin: 0; -} -body > * { - grid-column: 2; -} - -/* Make the header bg full width, but the content inline with body */ -body > header { - background-color: var(--accent-bg); - border-bottom: 1px solid var(--border); - text-align: center; - padding: 0 0.5rem 2rem 0.5rem; - grid-column: 1 / -1; -} - -body > header > *:only-child { - margin-block-start: 2rem; -} - -body > header h1 { - max-width: 1200px; - margin: 1rem auto; -} - -body > header p { - max-width: 40rem; - margin: 1rem auto; -} - -/* Add a little padding to ensure spacing is correct between content and header > nav */ -main { - padding-top: 1.5rem; -} - -body > footer { - margin-top: 4rem; - padding: 2rem 1rem 1.5rem 1rem; - color: var(--text-light); - font-size: 0.9rem; - text-align: center; - border-top: 1px solid var(--border); -} - -/* Format headers */ -h1 { - font-size: 3rem; -} - -h2 { - font-size: 2.6rem; - margin-top: 3rem; -} - -h3 { - font-size: 2rem; - margin-top: 3rem; -} - -h4 { - font-size: 1.44rem; -} - -h5 { - font-size: 1.15rem; -} - -h6 { - font-size: 0.96rem; -} - -p { - margin: 1.5rem 0; -} - -/* Prevent long strings from overflowing container */ -p, h1, h2, h3, h4, h5, h6 { - overflow-wrap: break-word; -} - -/* Fix line height when title wraps */ -h1, -h2, -h3 { - line-height: 1.1; -} - -/* Reduce header size on mobile */ -@media only screen and (max-width: 720px) { - h1 { - font-size: 2.5rem; - } - - h2 { - font-size: 2.1rem; - } - - h3 { - font-size: 1.75rem; - } - - h4 { - font-size: 1.25rem; - } -} - -/* Format links & buttons */ -a, -a:visited { - color: var(--accent); -} - -a:hover { - text-decoration: none; -} - -button, -.button, -a.button, /* extra specificity to override a */ -input[type="submit"], -input[type="reset"], -input[type="button"], -label[type="button"] { - border: 1px solid var(--accent); - background-color: var(--accent); - color: var(--accent-text); - padding: 0.5rem 0.9rem; - text-decoration: none; - line-height: normal; -} - -.button[aria-disabled="true"], -input:disabled, -textarea:disabled, -select:disabled, -button[disabled] { - cursor: not-allowed; - background-color: var(--disabled); - border-color: var(--disabled); - color: var(--text-light); -} - -input[type="range"] { - padding: 0; -} - -/* Set the cursor to '?' on an abbreviation and style the abbreviation to show that there is more information underneath */ -abbr[title] { - cursor: help; - text-decoration-line: underline; - text-decoration-style: dotted; -} - -button:enabled:hover, -.button:not([aria-disabled="true"]):hover, -input[type="submit"]:enabled:hover, -input[type="reset"]:enabled:hover, -input[type="button"]:enabled:hover, -label[type="button"]:hover { - background-color: var(--accent-hover); - border-color: var(--accent-hover); - cursor: pointer; -} - -.button:focus-visible, -button:focus-visible:where(:enabled), -input:enabled:focus-visible:where( - [type="submit"], - [type="reset"], - [type="button"] -) { - outline: 2px solid var(--accent); - outline-offset: 1px; -} - -/* Format navigation */ -header > nav { - font-size: 1rem; - line-height: 2; - padding: 1rem 0 0 0; -} - -/* Use flexbox to allow items to wrap, as needed */ -header > nav ul, -header > nav ol { - align-content: space-around; - align-items: center; - display: flex; - flex-direction: row; - flex-wrap: wrap; - justify-content: center; - list-style-type: none; - margin: 0; - padding: 0; -} - -/* List items are inline elements, make them behave more like blocks */ -header > nav ul li, -header > nav ol li { - display: inline-block; -} - -header > nav a, -header > nav a:visited { - margin: 0 0.5rem 1rem 0.5rem; - border: 1px solid var(--border); - border-radius: var(--standard-border-radius); - color: var(--text); - display: inline-block; - padding: 0.1rem 1rem; - text-decoration: none; -} - -header > nav a:hover, -header > nav a.current, -header > nav a[aria-current="page"], -header > nav a[aria-current="true"] { - border-color: var(--accent); - color: var(--accent); - cursor: pointer; -} - -/* Reduce nav side on mobile */ -@media only screen and (max-width: 720px) { - header > nav a { - border: none; + background-color: #000235; + color: white; + font-family: Arial, sans-serif; + margin: 0; padding: 0; - text-decoration: underline; - line-height: 1; - } -} - -/* Consolidate box styling */ -aside, details, pre, progress { - background-color: var(--accent-bg); - border: 1px solid var(--border); - border-radius: var(--standard-border-radius); - margin-bottom: 1rem; -} - -aside { - font-size: 1rem; - width: 30%; - padding: 0 15px; - margin-inline-start: 15px; - float: right; -} -*[dir="rtl"] aside { - float: left; -} - -/* Make aside full-width on mobile */ -@media only screen and (max-width: 720px) { - aside { - width: 100%; - float: none; - margin-inline-start: 0; - } -} - -article, fieldset, dialog { - border: 1px solid var(--border); - padding: 1rem; - border-radius: var(--standard-border-radius); - margin-bottom: 1rem; -} - -article h2:first-child, -section h2:first-child, -article h3:first-child, -section h3:first-child { - margin-top: 1rem; -} - -section { - border-top: 1px solid var(--border); - border-bottom: 1px solid var(--border); - padding: 2rem 1rem; - margin: 3rem 0; -} - -/* Don't double separators when chaining sections */ -section + section, -section:first-child { - border-top: 0; - padding-top: 0; -} - -section + section { - margin-top: 0; -} - -section:last-child { - border-bottom: 0; - padding-bottom: 0; -} - -details { - padding: 0.7rem 1rem; -} - -summary { - cursor: pointer; - font-weight: bold; - padding: 0.7rem 1rem; - margin: -0.7rem -1rem; - word-break: break-all; -} - -details[open] > summary + * { - margin-top: 0; -} - -details[open] > summary { - margin-bottom: 0.5rem; -} - -details[open] > :last-child { - margin-bottom: 0; -} - -/* Format tables */ -table { - border-collapse: collapse; - margin: 1.5rem 0; -} - -figure > table { - width: max-content; - margin: 0; -} - -td, -th { - border: 1px solid var(--border); - text-align: start; - padding: 0.5rem; -} - -th { - background-color: var(--accent-bg); - font-weight: bold; } -tr:nth-child(even) { - /* Set every other cell slightly darker. Improves readability. */ - background-color: var(--accent-bg); -} - -table caption { - font-weight: bold; - margin-bottom: 0.5rem; +h1 { + color: #FFD43B; + margin-top: 20px; } -/* Format forms */ -textarea, -select, -input, -button, -.button { - font-size: inherit; - font-family: inherit; - padding: 0.5rem; - margin-bottom: 0.5rem; - border-radius: var(--standard-border-radius); - box-shadow: none; - max-width: 100%; - display: inline-block; -} -textarea, -select, -input { - color: var(--text); - background-color: var(--bg); - border: 1px solid var(--border); -} -label { - display: block; -} -textarea:not([cols]) { - width: 100%; +.navbar { + background-color: transparent; } -/* Add arrow to drop-down */ -select:not([multiple]) { - background-image: linear-gradient(45deg, transparent 49%, var(--text) 51%), - linear-gradient(135deg, var(--text) 51%, transparent 49%); - background-position: calc(100% - 15px), calc(100% - 10px); - background-size: 5px 5px, 5px 5px; - background-repeat: no-repeat; - padding-inline-end: 25px; -} -*[dir="rtl"] select:not([multiple]) { - background-position: 10px, 15px; +.nav-link { + color: #FFD43B; } -/* checkbox and radio button style */ -input[type="checkbox"], -input[type="radio"] { - vertical-align: middle; - position: relative; - width: min-content; -} + .nav-link:hover { + color: #FFA500; + } -input[type="checkbox"] + label, -input[type="radio"] + label { - display: inline-block; +.btn { + background-color: #420599; + color: #FFD43B; } -input[type="radio"] { - border-radius: 100%; -} + .btn:hover { + background-color: #5935c4; + } -input[type="checkbox"]:checked, -input[type="radio"]:checked { - background-color: var(--accent); +.container { + width: 90%; + max-width: 1200px; + margin: 0 auto; + padding: 20px; } -input[type="checkbox"]:checked::after { - /* Creates a rectangle with colored right and bottom borders which is rotated to look like a check mark */ - content: " "; - width: 0.18em; - height: 0.32em; - border-radius: 0; - position: absolute; - top: 0.05em; - left: 0.17em; - background-color: transparent; - border-right: solid var(--bg) 0.08em; - border-bottom: solid var(--bg) 0.08em; - font-size: 1.8em; - transform: rotate(45deg); -} -input[type="radio"]:checked::after { - /* creates a colored circle for the checked radio button */ - content: " "; - width: 0.25em; - height: 0.25em; - border-radius: 100%; - position: absolute; - top: 0.125em; - background-color: var(--bg); - left: 0.125em; - font-size: 32px; +/* Hero Section */ +.hero-section { + display: flex; + align-items: center; + justify-content: center; + position: relative; + height: 100vh; + background: url('/images/Gamer.webp') no-repeat center center; + background-size: cover; + overflow: hidden; } -/* Makes input fields wider on smaller screens */ -@media only screen and (max-width: 720px) { - textarea, - select, - input { +.hero-overlay { + position: absolute; + top: 0; + left: 0; width: 100%; - } -} - -/* Set a height for color input */ -input[type="color"] { - height: 2.5rem; - padding: 0.2rem; -} - -/* do not show border around file selector button */ -input[type="file"] { - border: 0; -} - -/* Misc body elements */ -hr { - border: none; - height: 1px; - background: var(--border); - margin: 1rem auto; -} - -mark { - padding: 2px 5px; - border-radius: var(--standard-border-radius); - background-color: var(--marked); - color: black; -} - -mark a { - color: #0d47a1; -} - -img, -video { - max-width: 100%; - height: auto; - border-radius: var(--standard-border-radius); -} - -figure { - margin: 0; - display: block; - overflow-x: auto; -} - -figure > img, -figure > picture > img { - display: block; - margin-inline: auto; -} - -figcaption { - text-align: center; - font-size: 0.9rem; - color: var(--text-light); - margin-block: 1rem; -} - -blockquote { - margin-inline-start: 2rem; - margin-inline-end: 0; - margin-block: 2rem; - padding: 0.4rem 0.8rem; - border-inline-start: 0.35rem solid var(--accent); - color: var(--text-light); - font-style: italic; -} - -cite { - font-size: 0.9rem; - color: var(--text-light); - font-style: normal; -} - -dt { - color: var(--text-light); -} - -/* Use mono font for code elements */ -code, -pre, -pre span, -kbd, -samp { - font-family: var(--mono-font); - color: var(--code); -} - -kbd { - color: var(--preformatted); - border: 1px solid var(--preformatted); - border-bottom: 3px solid var(--preformatted); - border-radius: var(--standard-border-radius); - padding: 0.1rem 0.4rem; -} - -pre { - padding: 1rem 1.4rem; - max-width: 100%; - overflow: auto; - color: var(--preformatted); -} - -/* Fix embedded code within pre */ -pre code { - color: var(--preformatted); - background: none; - margin: 0; - padding: 0; -} - -/* Progress bars */ -/* Declarations are repeated because you */ -/* cannot combine vendor-specific selectors */ -progress { - width: 100%; -} - -progress:indeterminate { - background-color: var(--accent-bg); -} - -progress::-webkit-progress-bar { - border-radius: var(--standard-border-radius); - background-color: var(--accent-bg); -} - -progress::-webkit-progress-value { - border-radius: var(--standard-border-radius); - background-color: var(--accent); -} - -progress::-moz-progress-bar { - border-radius: var(--standard-border-radius); - background-color: var(--accent); - transition-property: width; - transition-duration: 0.3s; -} - -progress:indeterminate::-moz-progress-bar { - background-color: var(--accent-bg); -} - -dialog { - max-width: 40rem; - margin: auto; -} - -dialog::backdrop { - background-color: var(--bg); - opacity: 0.8; -} - -@media only screen and (max-width: 720px) { - dialog { - max-width: 100%; - margin: auto 1em; - } -} - -/* Superscript & Subscript */ -/* Prevent scripts from affecting line-height. */ -sup, sub { - vertical-align: baseline; - position: relative; -} - -sup { - top: -0.4em; -} - -sub { - top: 0.3em; -} - -/* Classes for notices */ -.notice { - background: var(--accent-bg); - border: 2px solid var(--border); - border-radius: var(--standard-border-radius); - padding: 1.5rem; - margin: 2rem 0; + height: 100%; + background: linear-gradient(180deg, rgba(0, 0, 0, 0.9) 0%, rgba(0, 0, 0, 0.4) 50%, rgba(0, 0, 0, 0.9) 100%); +} + +.hero-text { + position: relative; + z-index: 2; + text-align: center; + color: white; + animation: fadeIn 1.5s ease-in-out; +} + + .hero-text h1 { + font-size: 4em; + font-weight: bold; + text-transform: uppercase; + } + + .hero-text h2 { + margin-top: 0.5em; + font-size: 1.8em; + } + +.cta-button, .login-button { + margin-top: 20px; + font-size: 1.2em; + display: inline-block; + padding: 15px 30px; + text-transform: uppercase; + color: #FBFF00; + border: 2px solid #FBFF00; + text-shadow: 0 0 0.125em #FBFF00, 0 0 0.45em currentColor; + border-radius: 35px; + transition: background-color 0.3s, border-color 0.3s; +} + + .cta-button:hover, .login-button:hover { + background-color: #FF8C00; + color: white; + border-color: #FF8C00; + } + +.scroll-indicator { + position: absolute; + bottom: 10%; + animation: bounce 2s infinite; +} + +.scroll-arrow i { + font-size: 2em; + color: white; +} + +/* About Section */ +.about-section { + margin-top: 50px; + padding: 50px 20px; + background: #202c42; + color: white; + border-radius: 10px; + box-shadow: 0px 4px 15px rgba(0, 0, 0, 0.3); +} + + .about-section h2 { + font-size: 2.5em; + color: #FFD700; + margin-bottom: 20px; + } + +.feature-card { + background: #000235; + padding: 20px; + border-radius: 10px; + text-align: center; + transition: transform 0.3s, box-shadow 0.3s; +} + + .feature-card:hover { + transform: translateY(-5px); + box-shadow: 0px 4px 15px rgba(0, 0, 0, 0.3); + } + + .feature-card i { + font-size: 2.5em; + color: #FFD700; + margin-bottom: 10px; + } + + .feature-card h5 { + color: white; + } + +/* Footer */ +.footer { + margin-top: auto; + padding: 20px 0; + text-align: center; + border-top: 1px solid #333; + background-color: #000235; + color: white; +} + + .footer a { + color: #FFD700; + } + + .footer a:hover { + color: #FFA500; + } + +/* Keyframes for animations */ +@keyframes fadeIn { + from { + opacity: 0; + transform: translateY(-10px); + } + + to { + opacity: 1; + transform: translateY(0); + } +} + +@keyframes bounce { + 0%, 100% { + transform: translateY(0); + } + + 50% { + transform: translateY(-10px); + } } From 37c8fe1b4ad7347e642069ebad404a7b03d087e3 Mon Sep 17 00:00:00 2001 From: Mathias Date: Mon, 25 Nov 2024 18:17:03 +0100 Subject: [PATCH 07/19] Update Create.cshtml.cs Fix account not enabled --- GameLibrary/Pages/Admin/Users/Create.cshtml.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/GameLibrary/Pages/Admin/Users/Create.cshtml.cs b/GameLibrary/Pages/Admin/Users/Create.cshtml.cs index 1790f53..750b9fa 100644 --- a/GameLibrary/Pages/Admin/Users/Create.cshtml.cs +++ b/GameLibrary/Pages/Admin/Users/Create.cshtml.cs @@ -36,8 +36,7 @@ public IActionResult OnGet() IdentityUser = new User { UserName = "", - Email = "", - CreatedAt = DateTime.UtcNow + Email = "" }; return Page(); } @@ -59,7 +58,7 @@ public async Task OnPostAsync() { UserName = IdentityUser!.UserName, Email = IdentityUser.Email, - CreatedAt = DateTime.UtcNow + EmailConfirmed = true }; var result = await _userManager.CreateAsync(user, Password!); From dc7b7c241f02e837962518ccf9a0d9909a6e71ce Mon Sep 17 00:00:00 2001 From: Mathias Date: Fri, 29 Nov 2024 12:48:30 +0100 Subject: [PATCH 08/19] Remove about --- GameLibrary/Pages/About.cshtml | 8 -------- GameLibrary/Pages/About.cshtml.cs | 26 ------------------------- GameLibrary/Pages/Shared/_Layout.cshtml | 1 - 3 files changed, 35 deletions(-) delete mode 100644 GameLibrary/Pages/About.cshtml delete mode 100644 GameLibrary/Pages/About.cshtml.cs diff --git a/GameLibrary/Pages/About.cshtml b/GameLibrary/Pages/About.cshtml deleted file mode 100644 index 63b9ab3..0000000 --- a/GameLibrary/Pages/About.cshtml +++ /dev/null @@ -1,8 +0,0 @@ -@page -@model GameLibrary.Pages.AboutModel -@{ - ViewData["Title"] = "About"; -} -

      @ViewData["Title"]

      - -

      Use this area to provide additional information.

      diff --git a/GameLibrary/Pages/About.cshtml.cs b/GameLibrary/Pages/About.cshtml.cs deleted file mode 100644 index 6fe82e7..0000000 --- a/GameLibrary/Pages/About.cshtml.cs +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright 2024 Web.Tech. Group17 -// -// Licensed under the Apache License, Version 2.0 (the "License"): -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -using Microsoft.AspNetCore.Mvc.RazorPages; - -namespace GameLibrary.Pages -{ - public class AboutModel : PageModel - { - public void OnGet() - { - - } - } -} diff --git a/GameLibrary/Pages/Shared/_Layout.cshtml b/GameLibrary/Pages/Shared/_Layout.cshtml index d8c83a2..8503966 100644 --- a/GameLibrary/Pages/Shared/_Layout.cshtml +++ b/GameLibrary/Pages/Shared/_Layout.cshtml @@ -27,7 +27,6 @@ From 872b05fc4929cb511f02d903e1fb45e9dd1f83b1 Mon Sep 17 00:00:00 2001 From: Mathias Date: Fri, 29 Nov 2024 13:02:20 +0100 Subject: [PATCH 09/19] Add compression --- GameLibrary/Program.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/GameLibrary/Program.cs b/GameLibrary/Program.cs index 1dd2825..a30c754 100644 --- a/GameLibrary/Program.cs +++ b/GameLibrary/Program.cs @@ -50,10 +50,17 @@ public static void Main(string[] args) options.AddPolicy("RequireAdministratorRole", policy => policy.RequireRole("Administrator")); }); + builder.Services.AddResponseCompression(options => + { + options.EnableForHttps = true; + }); + builder.Services.AddRazorPages(); var app = builder.Build(); + app.UseResponseCompression(); + // Configure the HTTP request pipeline. if (app.Environment.IsDevelopment()) { From 211657bfae0e34acd884cf4dcb6253ea95d7a098 Mon Sep 17 00:00:00 2001 From: Mathias Date: Fri, 29 Nov 2024 13:07:23 +0100 Subject: [PATCH 10/19] Add GZip --- GameLibrary/Program.cs | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/GameLibrary/Program.cs b/GameLibrary/Program.cs index a30c754..6cc7c2f 100644 --- a/GameLibrary/Program.cs +++ b/GameLibrary/Program.cs @@ -14,7 +14,9 @@ using GameLibrary.Data; using GameLibrary.Models; +using Microsoft.AspNetCore.ResponseCompression; using Microsoft.EntityFrameworkCore; +using System.IO.Compression; namespace GameLibrary; @@ -53,6 +55,18 @@ public static void Main(string[] args) builder.Services.AddResponseCompression(options => { options.EnableForHttps = true; + options.Providers.Add(); + options.Providers.Add(); + }); + + builder.Services.Configure(options => + { + options.Level = CompressionLevel.Fastest; + }); + + builder.Services.Configure(options => + { + options.Level = CompressionLevel.SmallestSize; }); builder.Services.AddRazorPages(); From 0fb0ce28227eb18cfef28c6e36dbd0042b13fe10 Mon Sep 17 00:00:00 2001 From: Mathias Date: Sun, 1 Dec 2024 20:38:12 +0100 Subject: [PATCH 11/19] Role Assignment --- GameLibrary/Pages/Admin/Users/Create.cshtml | 74 +++++++++---------- .../Pages/Admin/Users/Create.cshtml.cs | 35 ++++++--- GameLibrary/Pages/Admin/Users/Delete.cshtml | 66 +++++++++-------- .../Pages/Admin/Users/Delete.cshtml.cs | 22 +++--- GameLibrary/Pages/Admin/Users/Edit.cshtml | 74 +++++++++---------- GameLibrary/Pages/Admin/Users/Edit.cshtml.cs | 44 ++++++----- GameLibrary/Pages/Admin/Users/Index.cshtml | 62 ++++++++-------- GameLibrary/Pages/Admin/Users/Index.cshtml.cs | 23 +++--- 8 files changed, 212 insertions(+), 188 deletions(-) diff --git a/GameLibrary/Pages/Admin/Users/Create.cshtml b/GameLibrary/Pages/Admin/Users/Create.cshtml index 6dd8fbe..9b83f4d 100644 --- a/GameLibrary/Pages/Admin/Users/Create.cshtml +++ b/GameLibrary/Pages/Admin/Users/Create.cshtml @@ -5,41 +5,41 @@ ViewData["Title"] = "Create User"; } - - -
      -

      Create User

      -
      - -
      -
      -
      -
      - -
      - - - -
      - -
      - - - -
      - -
      - - - -
      - -
      - - Back to List -
      -
      -
      +

      Create User

      + +
      +
      +
      +
      + +
      + + + +
      + +
      + + + +
      + +
      + + + +
      + +
      + + + +
      + +
      + + Back to List +
      +
      - - +
      diff --git a/GameLibrary/Pages/Admin/Users/Create.cshtml.cs b/GameLibrary/Pages/Admin/Users/Create.cshtml.cs index 750b9fa..2a9302c 100644 --- a/GameLibrary/Pages/Admin/Users/Create.cshtml.cs +++ b/GameLibrary/Pages/Admin/Users/Create.cshtml.cs @@ -17,20 +17,12 @@ using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; +using Microsoft.AspNetCore.Mvc.Rendering; namespace GameLibrary.Pages.Admin.Users; -public class CreateModel : PageModel +public class CreateModel(ApplicationDbContext context, UserManager userManager, RoleManager roleManager) : PageModel { - private readonly ApplicationDbContext _context; - private readonly UserManager _userManager; - - public CreateModel(ApplicationDbContext context, UserManager userManager) - { - _context = context; - _userManager = userManager; - } - public IActionResult OnGet() { IdentityUser = new User @@ -38,6 +30,13 @@ public IActionResult OnGet() UserName = "", Email = "" }; + + // Populate roles for dropdown + Roles = [.. roleManager.Roles.Select(r => new SelectListItem { Value = r.Name, Text = r.Name })]; + + // Default role + SelectedRole = "User"; + return Page(); } @@ -47,10 +46,16 @@ public IActionResult OnGet() [BindProperty] public string? Password { get; set; } + [BindProperty] + public string SelectedRole { get; set; } = "User"; + + public List Roles { get; set; } = []; + public async Task OnPostAsync() { if (!ModelState.IsValid) { + Roles = [.. roleManager.Roles.Select(r => new SelectListItem { Value = r.Name, Text = r.Name })]; return Page(); } @@ -61,10 +66,16 @@ public async Task OnPostAsync() EmailConfirmed = true }; - var result = await _userManager.CreateAsync(user, Password!); + var result = await userManager.CreateAsync(user, Password!); if (result.Succeeded) { + // Assign selected role + if (!string.IsNullOrEmpty(SelectedRole)) + { + _ = await userManager.AddToRoleAsync(user, SelectedRole); + } + return RedirectToPage("./Index"); } @@ -73,6 +84,8 @@ public async Task OnPostAsync() ModelState.AddModelError(string.Empty, error.Description); } + Roles = [.. roleManager.Roles.Select(r => new SelectListItem { Value = r.Name, Text = r.Name })]; + return Page(); } } diff --git a/GameLibrary/Pages/Admin/Users/Delete.cshtml b/GameLibrary/Pages/Admin/Users/Delete.cshtml index b3ad43f..156ace1 100644 --- a/GameLibrary/Pages/Admin/Users/Delete.cshtml +++ b/GameLibrary/Pages/Admin/Users/Delete.cshtml @@ -5,38 +5,40 @@ ViewData["Title"] = "Delete User"; } - +
      +

      Delete User

      +

      Are you sure you want to delete this user?

      +
      -
      -

      Delete User

      -

      Are you sure you want to delete this user?

      -
      - -
      -
      -
      -
      - @Html.DisplayNameFor(model => model.IdentityUser!.UserName) -
      -
      - @Html.DisplayFor(model => model.IdentityUser!.UserName) -
      -
      - @Html.DisplayNameFor(model => model.IdentityUser!.Email) -
      -
      - @Html.DisplayFor(model => model.IdentityUser!.Email) -
      -
      -
      -
      - -
      -
      - - - Back to List -
      +
      +
      +
      +
      + @Html.DisplayNameFor(model => model.IdentityUser!.UserName) +
      +
      + @Html.DisplayFor(model => model.IdentityUser!.UserName) +
      +
      + @Html.DisplayNameFor(model => model.IdentityUser!.Email) +
      +
      + @Html.DisplayFor(model => model.IdentityUser!.Email) +
      +
      + Role +
      +
      + @Model.UserRole +
      +
      +
      - +
      +
      + + + Back to List +
      +
      diff --git a/GameLibrary/Pages/Admin/Users/Delete.cshtml.cs b/GameLibrary/Pages/Admin/Users/Delete.cshtml.cs index 027df6e..694855e 100644 --- a/GameLibrary/Pages/Admin/Users/Delete.cshtml.cs +++ b/GameLibrary/Pages/Admin/Users/Delete.cshtml.cs @@ -21,20 +21,13 @@ namespace GameLibrary.Pages.Admin.Users; -public class DeleteModel : PageModel +public class DeleteModel(ApplicationDbContext context, UserManager userManager) : PageModel { - private readonly ApplicationDbContext _context; - private readonly UserManager _userManager; - - public DeleteModel(ApplicationDbContext context, UserManager userManager) - { - _context = context; - _userManager = userManager; - } - [BindProperty] public User? IdentityUser { get; set; } + public string? UserRole { get; set; } + public async Task OnGetAsync(Guid? id) { if (id == null) @@ -42,13 +35,16 @@ public async Task OnGetAsync(Guid? id) return NotFound(); } - IdentityUser = await _userManager.Users.FirstOrDefaultAsync(u => u.Id == id); + IdentityUser = await userManager.Users.FirstOrDefaultAsync(u => u.Id == id); if (IdentityUser == null) { return NotFound(); } + var roles = await userManager.GetRolesAsync(IdentityUser); + UserRole = roles.FirstOrDefault() ?? "No Role"; + return Page(); } @@ -59,11 +55,11 @@ public async Task OnPostAsync(Guid? id) return NotFound(); } - IdentityUser = await _userManager.Users.FirstOrDefaultAsync(u => u.Id == id); + IdentityUser = await userManager.Users.FirstOrDefaultAsync(u => u.Id == id); if (IdentityUser != null) { - var result = await _userManager.DeleteAsync(IdentityUser); + var result = await userManager.DeleteAsync(IdentityUser); if (result.Succeeded) { diff --git a/GameLibrary/Pages/Admin/Users/Edit.cshtml b/GameLibrary/Pages/Admin/Users/Edit.cshtml index 8fca546..9e87bb9 100644 --- a/GameLibrary/Pages/Admin/Users/Edit.cshtml +++ b/GameLibrary/Pages/Admin/Users/Edit.cshtml @@ -5,41 +5,41 @@ ViewData["Title"] = "Edit User"; } - - -
      -

      Edit User

      -
      - -
      -
      -
      -
      - -
      - - - -
      - -
      - - - -
      - -
      - - - -
      - -
      - - Back to List -
      -
      -
      +

      Edit User

      + +
      +
      +
      +
      + +
      + + + +
      + +
      + + + +
      + +
      + + + +
      + +
      + + + +
      + +
      + + Back to List +
      +
      - - +
      diff --git a/GameLibrary/Pages/Admin/Users/Edit.cshtml.cs b/GameLibrary/Pages/Admin/Users/Edit.cshtml.cs index 9383b7f..054fcf8 100644 --- a/GameLibrary/Pages/Admin/Users/Edit.cshtml.cs +++ b/GameLibrary/Pages/Admin/Users/Edit.cshtml.cs @@ -17,27 +17,24 @@ using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; +using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.EntityFrameworkCore; namespace GameLibrary.Pages.Admin.Users; -public class EditModel : PageModel +public class EditModel(ApplicationDbContext context, UserManager userManager, RoleManager roleManager) : PageModel { - private readonly ApplicationDbContext _context; - private readonly UserManager _userManager; - - public EditModel(ApplicationDbContext context, UserManager userManager) - { - _context = context; - _userManager = userManager; - } - [BindProperty] public User? IdentityUser { get; set; } [BindProperty] public string? Password { get; set; } + [BindProperty] + public string SelectedRole { get; set; } = string.Empty; + + public List Roles { get; set; } = []; + public async Task OnGetAsync(Guid? id) { if (id == null) @@ -45,13 +42,18 @@ public async Task OnGetAsync(Guid? id) return NotFound(); } - IdentityUser = await _userManager.Users.FirstOrDefaultAsync(u => u.Id == id); + IdentityUser = await userManager.Users.FirstOrDefaultAsync(u => u.Id == id); - if (User == null) + if (IdentityUser == null) { return NotFound(); } + Roles = [.. roleManager.Roles.Select(r => new SelectListItem { Value = r.Name, Text = r.Name })]; + + var userRoles = await userManager.GetRolesAsync(IdentityUser); + SelectedRole = userRoles.FirstOrDefault() ?? "User"; + return Page(); } @@ -59,6 +61,7 @@ public async Task OnPostAsync(Guid? id) { if (!ModelState.IsValid) { + Roles = [.. roleManager.Roles.Select(r => new SelectListItem { Value = r.Name, Text = r.Name })]; return Page(); } @@ -67,7 +70,7 @@ public async Task OnPostAsync(Guid? id) return NotFound(); } - var userToUpdate = await _userManager.Users.FirstOrDefaultAsync(u => u.Id == id); + var userToUpdate = await userManager.Users.FirstOrDefaultAsync(u => u.Id == id); if (userToUpdate == null) { @@ -76,13 +79,13 @@ public async Task OnPostAsync(Guid? id) if (await TryUpdateModelAsync( userToUpdate, - "user", + "IdentityUser", u => u.UserName, u => u.Email)) { if (!string.IsNullOrEmpty(Password)) { - var token = await _userManager.GeneratePasswordResetTokenAsync(userToUpdate); - var result = await _userManager.ResetPasswordAsync(userToUpdate, token, Password); + var token = await userManager.GeneratePasswordResetTokenAsync(userToUpdate); + var result = await userManager.ResetPasswordAsync(userToUpdate, token, Password); if (!result.Succeeded) { @@ -94,10 +97,17 @@ public async Task OnPostAsync(Guid? id) } } - await _context.SaveChangesAsync(); + // Update user's role + var currentRoles = await userManager.GetRolesAsync(userToUpdate); + _ = await userManager.RemoveFromRolesAsync(userToUpdate, currentRoles); + _ = await userManager.AddToRoleAsync(userToUpdate, SelectedRole); + + _ = await context.SaveChangesAsync(); return RedirectToPage("./Index"); } + Roles = [.. roleManager.Roles.Select(r => new SelectListItem { Value = r.Name, Text = r.Name })]; + return Page(); } } diff --git a/GameLibrary/Pages/Admin/Users/Index.cshtml b/GameLibrary/Pages/Admin/Users/Index.cshtml index 975dafd..dab433b 100644 --- a/GameLibrary/Pages/Admin/Users/Index.cshtml +++ b/GameLibrary/Pages/Admin/Users/Index.cshtml @@ -6,36 +6,36 @@ ViewData["ActivePage"] = ManageNavPages.Users; } - -
      -

      Users

      -

      - Create New -

      -
      +
      +

      Users

      +

      + Create New +

      +
      -
      - - - - - - +
      +
      User NameEmailActions
      + + + + + + + + + + @foreach (var item in Model.IdentityUsers!) + { + + + + + - - - @foreach (var item in Model.IdentityUsers!) - { - - - - - - } - -
      User NameEmailRoleActions
      @item.UserName@item.Email@(Model.UserRoles.ContainsKey(item.Id) ? Model.UserRoles[item.Id] : "No Role") + Edit + Delete +
      @Html.DisplayFor(modelItem => item.UserName)@Html.DisplayFor(modelItem => item.Email) - Edit - Delete -
      -
      - + } + + +
      diff --git a/GameLibrary/Pages/Admin/Users/Index.cshtml.cs b/GameLibrary/Pages/Admin/Users/Index.cshtml.cs index 13c2b93..b356131 100644 --- a/GameLibrary/Pages/Admin/Users/Index.cshtml.cs +++ b/GameLibrary/Pages/Admin/Users/Index.cshtml.cs @@ -14,24 +14,27 @@ using GameLibrary.Data; using GameLibrary.Models; +using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.EntityFrameworkCore; namespace GameLibrary.Pages.Admin.Users; -public class IndexModel : PageModel +public class IndexModel(ApplicationDbContext context, UserManager userManager) : PageModel { - private readonly ApplicationDbContext _context; - - public IndexModel(ApplicationDbContext context) - { - _context = context; - } - - public IList? IdentityUsers { get; set; } + public IList IdentityUsers { get; set; } = []; + public Dictionary UserRoles { get; set; } = []; public async Task OnGetAsync() { - IdentityUsers = await _context.Users.ToListAsync(); + // Fetch all users + IdentityUsers = await context.Users.ToListAsync(); + + // Fetch roles for each user + foreach (var user in IdentityUsers) + { + var roles = await userManager.GetRolesAsync(user); + UserRoles[user.Id] = roles.FirstOrDefault() ?? "No Role"; + } } } From 149f0cf90f9b822efe828bec82112537f9b7bbec Mon Sep 17 00:00:00 2001 From: Mathias Date: Thu, 5 Dec 2024 20:38:14 +0100 Subject: [PATCH 12/19] Add vscode debugging --- .vscode/launch.json | 25 +++++++++++++++++++++++++ .vscode/tasks.json | 29 +++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 .vscode/launch.json create mode 100644 .vscode/tasks.json diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..89bbd26 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,25 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "name": ".NET Core Launch (web)", + "type": "coreclr", + "request": "launch", + "preLaunchTask": "build", + "program": "${workspaceFolder}/GameLibrary/bin/Debug/net8.0/GameLibrary.dll", + "args": [], + "cwd": "${workspaceFolder}/GameLibrary", + "stopAtEntry": false, + "serverReadyAction": { + "action": "openExternally", + "pattern": "\\bNow listening on:\\s+(https?://\\S+)" + }, + "env": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "sourceFileMap": { + "/Views": "${workspaceFolder}/Views" + } + } + ] +} diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000..ede7415 --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,29 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "label": "build", + "command": "dotnet", + "type": "process", + "args": [ + "build", + "${workspaceFolder}/GameLibrary.sln", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary;ForceNoAlign" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "publish", + "command": "dotnet", + "type": "process", + "args": [ + "publish", + "${workspaceFolder}/GameLibrary.sln", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary;ForceNoAlign" + ], + "problemMatcher": "$msCompile" + } + ] +} From 46d0b8a4a4784775568686ad48e8b22d355d5b49 Mon Sep 17 00:00:00 2001 From: Mathias Date: Sun, 8 Dec 2024 17:40:12 +0100 Subject: [PATCH 13/19] Fix favorites Fixed: - Using workaround, by creating instance in model instead of form, due to required fields Added: - Navigation link to admin panel in user manage --- GameLibrary/Pages/Account/Manage/Index.cshtml | 5 +++ .../Pages/Account/Manage/Index.cshtml.cs | 3 ++ .../Pages/Admin/UserFavorites/Create.cshtml | 12 ++--- .../Admin/UserFavorites/Create.cshtml.cs | 21 ++++++--- .../Pages/Admin/UserFavorites/Edit.cshtml | 15 ++++--- .../Pages/Admin/UserFavorites/Edit.cshtml.cs | 44 +++++++++++++++---- GameLibrary/Pages/Games/Details.cshtml.cs | 3 +- 7 files changed, 75 insertions(+), 28 deletions(-) diff --git a/GameLibrary/Pages/Account/Manage/Index.cshtml b/GameLibrary/Pages/Account/Manage/Index.cshtml index d774475..dc78fb2 100644 --- a/GameLibrary/Pages/Account/Manage/Index.cshtml +++ b/GameLibrary/Pages/Account/Manage/Index.cshtml @@ -22,5 +22,10 @@
      + + @if (Model.IsAdminRole) + { + Admin Dashboard + }
      diff --git a/GameLibrary/Pages/Account/Manage/Index.cshtml.cs b/GameLibrary/Pages/Account/Manage/Index.cshtml.cs index 693c235..28b8bf2 100644 --- a/GameLibrary/Pages/Account/Manage/Index.cshtml.cs +++ b/GameLibrary/Pages/Account/Manage/Index.cshtml.cs @@ -35,6 +35,7 @@ public IndexModel( _signInManager = signInManager; } + public bool IsAdminRole { get; set; } /// /// This API supports the ASP.NET Core Identity default UI infrastructure and is not intended to be used /// directly from your code. This API may change or be removed in future releases. @@ -91,6 +92,8 @@ public async Task OnGetAsync() return NotFound($"Unable to load user with ID '{_userManager.GetUserId(User)}'."); } + IsAdminRole = _userManager.IsInRoleAsync(user, "Administrator").Result; + await LoadAsync(user); return Page(); } diff --git a/GameLibrary/Pages/Admin/UserFavorites/Create.cshtml b/GameLibrary/Pages/Admin/UserFavorites/Create.cshtml index 86222b9..1a83a33 100644 --- a/GameLibrary/Pages/Admin/UserFavorites/Create.cshtml +++ b/GameLibrary/Pages/Admin/UserFavorites/Create.cshtml @@ -17,19 +17,19 @@
      - - - +
      - - - +
      diff --git a/GameLibrary/Pages/Admin/UserFavorites/Create.cshtml.cs b/GameLibrary/Pages/Admin/UserFavorites/Create.cshtml.cs index cd28d07..a7026fa 100644 --- a/GameLibrary/Pages/Admin/UserFavorites/Create.cshtml.cs +++ b/GameLibrary/Pages/Admin/UserFavorites/Create.cshtml.cs @@ -32,6 +32,12 @@ public CreateModel(ApplicationDbContext context) public SelectList Games { get; set; } = null!; public SelectList Users { get; set; } = null!; + [BindProperty] + public Guid SelectedUserId { get; set; } + + [BindProperty] + public Guid SelectedGameId { get; set; } + public IActionResult OnGet() { Games = new SelectList(_context.Games, "Id", "Title"); @@ -39,18 +45,23 @@ public IActionResult OnGet() return Page(); } - [BindProperty] - public UserFavorite? UserFavorite { get; set; } - public async Task OnPostAsync() { if (!ModelState.IsValid) { + Games = new SelectList(_context.Games, "Id", "Title"); + Users = new SelectList(_context.Users, "Id", "UserName"); return Page(); } - UserFavorite!.AddedAt = DateTime.UtcNow; - _context.UserFavorites.Add(UserFavorite); + var userFavorite = new UserFavorite + { + UserId = SelectedUserId, + GameId = SelectedGameId, + AddedAt = DateTime.UtcNow + }; + + _context.UserFavorites.Add(userFavorite); await _context.SaveChangesAsync(); return RedirectToPage("./Index"); diff --git a/GameLibrary/Pages/Admin/UserFavorites/Edit.cshtml b/GameLibrary/Pages/Admin/UserFavorites/Edit.cshtml index a388085..1fb99e0 100644 --- a/GameLibrary/Pages/Admin/UserFavorites/Edit.cshtml +++ b/GameLibrary/Pages/Admin/UserFavorites/Edit.cshtml @@ -15,22 +15,23 @@
      - + +
      - - - +
      - - - +
      diff --git a/GameLibrary/Pages/Admin/UserFavorites/Edit.cshtml.cs b/GameLibrary/Pages/Admin/UserFavorites/Edit.cshtml.cs index ddcf6f5..e442176 100644 --- a/GameLibrary/Pages/Admin/UserFavorites/Edit.cshtml.cs +++ b/GameLibrary/Pages/Admin/UserFavorites/Edit.cshtml.cs @@ -30,12 +30,18 @@ public EditModel(ApplicationDbContext context) _context = context; } - [BindProperty] - public UserFavorite? UserFavorite { get; set; } - public SelectList? Games { get; set; } public SelectList? Users { get; set; } + [BindProperty] + public Guid SelectedId { get; set; } + + [BindProperty] + public Guid SelectedUserId { get; set; } + + [BindProperty] + public Guid SelectedGameId { get; set; } + public async Task OnGetAsync(Guid? id) { if (id == null) @@ -43,16 +49,20 @@ public async Task OnGetAsync(Guid? id) return NotFound(); } - UserFavorite = await _context.UserFavorites - .Include(uf => uf.Game) - .Include(uf => uf.User) + var userFavorite = await _context.UserFavorites + .AsNoTracking() // No need to track here .FirstOrDefaultAsync(m => m.Id == id); - if (UserFavorite == null) + if (userFavorite == null) { return NotFound(); } + // Set the properties for binding back to the form + SelectedId = userFavorite.Id; + SelectedUserId = userFavorite.UserId; + SelectedGameId = userFavorite.GameId; + Games = new SelectList(_context.Games, "Id", "Title"); Users = new SelectList(_context.Users, "Id", "UserName"); @@ -63,10 +73,26 @@ public async Task OnPostAsync() { if (!ModelState.IsValid) { + // Re-populate select lists in case of validation failure + Games = new SelectList(_context.Games, "Id", "Title"); + Users = new SelectList(_context.Users, "Id", "UserName"); return Page(); } - _context.Attach(UserFavorite!).State = EntityState.Modified; + // Retrieve the original entity from the database + var userFavorite = await _context.UserFavorites.FindAsync(SelectedId); + + if (userFavorite == null) + { + return NotFound(); + } + + // Update only the properties that are needed + userFavorite.UserId = SelectedUserId; + userFavorite.GameId = SelectedGameId; + + // Mark entity as modified + _context.Attach(userFavorite).State = EntityState.Modified; try { @@ -74,7 +100,7 @@ public async Task OnPostAsync() } catch (DbUpdateConcurrencyException) { - if (!UserFavoriteExists(UserFavorite!.Id)) + if (!UserFavoriteExists(SelectedId)) { return NotFound(); } diff --git a/GameLibrary/Pages/Games/Details.cshtml.cs b/GameLibrary/Pages/Games/Details.cshtml.cs index 49a0135..eaa76eb 100644 --- a/GameLibrary/Pages/Games/Details.cshtml.cs +++ b/GameLibrary/Pages/Games/Details.cshtml.cs @@ -172,7 +172,8 @@ public async Task OnPostAddToFavoritesAsync(Guid id) var userFavorite = new UserFavorite { UserId = userGuid, - GameId = id + GameId = id, + AddedAt = DateTime.UtcNow }; _context.UserFavorites.Add(userFavorite); From 2127e52d4844ed5ce9a4f5d88c9d57fd4c43d18f Mon Sep 17 00:00:00 2001 From: Mathias Date: Sun, 8 Dec 2024 18:04:55 +0100 Subject: [PATCH 14/19] Review crud fix Fixed: - Index display - Workaround for object init --- GameLibrary/Pages/Admin/Reviews/Create.cshtml | 31 ++++--- .../Pages/Admin/Reviews/Create.cshtml.cs | 30 +++++-- GameLibrary/Pages/Admin/Reviews/Edit.cshtml | 34 +++++--- .../Pages/Admin/Reviews/Edit.cshtml.cs | 83 ++++++++++++------- GameLibrary/Pages/Admin/Reviews/Index.cshtml | 4 +- 5 files changed, 121 insertions(+), 61 deletions(-) diff --git a/GameLibrary/Pages/Admin/Reviews/Create.cshtml b/GameLibrary/Pages/Admin/Reviews/Create.cshtml index bec443d..3815a11 100644 --- a/GameLibrary/Pages/Admin/Reviews/Create.cshtml +++ b/GameLibrary/Pages/Admin/Reviews/Create.cshtml @@ -17,31 +17,38 @@
      - - - +
      - - - +
      - - - + + +
      - - - + + +
      diff --git a/GameLibrary/Pages/Admin/Reviews/Create.cshtml.cs b/GameLibrary/Pages/Admin/Reviews/Create.cshtml.cs index d7810d7..eff97dc 100644 --- a/GameLibrary/Pages/Admin/Reviews/Create.cshtml.cs +++ b/GameLibrary/Pages/Admin/Reviews/Create.cshtml.cs @@ -32,6 +32,18 @@ public CreateModel(ApplicationDbContext context) public SelectList Games { get; set; } = null!; public SelectList Users { get; set; } = null!; + [BindProperty] + public Guid SelectedGameId { get; set; } + + [BindProperty] + public Guid SelectedUserId { get; set; } + + [BindProperty] + public int SelectedRating { get; set; } + + [BindProperty] + public string? SelectedContent { get; set; } + public IActionResult OnGet() { Games = new SelectList(_context.Games, "Id", "Title"); @@ -39,18 +51,26 @@ public IActionResult OnGet() return Page(); } - [BindProperty] - public Review? Review { get; set; } - public async Task OnPostAsync() { if (!ModelState.IsValid) { + // Re-populate lists on validation failure + Games = new SelectList(_context.Games, "Id", "Title"); + Users = new SelectList(_context.Users, "Id", "UserName"); return Page(); } - Review!.CreatedAt = DateTime.UtcNow; - _context.Reviews.Add(Review); + var review = new Review + { + GameId = SelectedGameId, + UserId = SelectedUserId, + Rating = SelectedRating, + Content = SelectedContent ?? string.Empty, + CreatedAt = DateTime.UtcNow + }; + + _context.Reviews.Add(review); await _context.SaveChangesAsync(); return RedirectToPage("./Index"); diff --git a/GameLibrary/Pages/Admin/Reviews/Edit.cshtml b/GameLibrary/Pages/Admin/Reviews/Edit.cshtml index 972a36e..90c468d 100644 --- a/GameLibrary/Pages/Admin/Reviews/Edit.cshtml +++ b/GameLibrary/Pages/Admin/Reviews/Edit.cshtml @@ -15,34 +15,42 @@
      - + +
      - - - +
      - - - +
      - - - + + +
      - - - + + +
      diff --git a/GameLibrary/Pages/Admin/Reviews/Edit.cshtml.cs b/GameLibrary/Pages/Admin/Reviews/Edit.cshtml.cs index aa87edc..777c0c4 100644 --- a/GameLibrary/Pages/Admin/Reviews/Edit.cshtml.cs +++ b/GameLibrary/Pages/Admin/Reviews/Edit.cshtml.cs @@ -1,17 +1,3 @@ -// Copyright 2024 Web.Tech. Group17 -// -// Licensed under the Apache License, Version 2.0 (the "License"): -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - using GameLibrary.Data; using GameLibrary.Models; using Microsoft.AspNetCore.Mvc; @@ -30,12 +16,24 @@ public EditModel(ApplicationDbContext context) _context = context; } - [BindProperty] - public Review? Review { get; set; } - public SelectList Games { get; set; } = null!; public SelectList Users { get; set; } = null!; + [BindProperty] + public Guid SelectedId { get; set; } + + [BindProperty] + public Guid SelectedGameId { get; set; } + + [BindProperty] + public Guid SelectedUserId { get; set; } + + [BindProperty] + public int SelectedRating { get; set; } + + [BindProperty] + public string? SelectedContent { get; set; } + public async Task OnGetAsync(Guid? id) { if (id == null) @@ -43,13 +41,19 @@ public async Task OnGetAsync(Guid? id) return NotFound(); } - Review = await _context.Reviews.FirstOrDefaultAsync(m => m.Id == id); - - if (Review == null) + var review = await _context.Reviews.AsNoTracking().FirstOrDefaultAsync(m => m.Id == id); + if (review == null) { return NotFound(); } + // Populate the bindable properties + SelectedId = review.Id; + SelectedGameId = review.GameId; + SelectedUserId = review.UserId; + SelectedRating = review.Rating; + SelectedContent = review.Content; + Games = new SelectList(await _context.Games.ToListAsync(), "Id", "Title"); Users = new SelectList(await _context.Users.ToListAsync(), "Id", "UserName"); @@ -60,26 +64,47 @@ public async Task OnPostAsync() { if (!ModelState.IsValid) { + Games = new SelectList(await _context.Games.ToListAsync(), "Id", "Title"); + Users = new SelectList(await _context.Users.ToListAsync(), "Id", "UserName"); return Page(); } - var reviewToUpdate = await _context.Reviews.FindAsync(Review!.Id); - + var reviewToUpdate = await _context.Reviews.FindAsync(SelectedId); if (reviewToUpdate == null) { return NotFound(); } - if (await TryUpdateModelAsync( - reviewToUpdate, - "review", - r => r.GameId, r => r.UserId, r => r.Rating, r => r.Content)) + // Update the entity + reviewToUpdate.GameId = SelectedGameId; + reviewToUpdate.UserId = SelectedUserId; + reviewToUpdate.Rating = SelectedRating; + reviewToUpdate.Content = SelectedContent ?? string.Empty; + reviewToUpdate.UpdatedAt = DateTime.UtcNow; + + _context.Attach(reviewToUpdate).State = EntityState.Modified; + + try { - reviewToUpdate.UpdatedAt = DateTime.UtcNow; await _context.SaveChangesAsync(); - return RedirectToPage("./Index"); + } + catch (DbUpdateConcurrencyException) + { + if (!ReviewExists(SelectedId)) + { + return NotFound(); + } + else + { + throw; + } } - return Page(); + return RedirectToPage("./Index"); + } + + private bool ReviewExists(Guid id) + { + return _context.Reviews.Any(e => e.Id == id); } } diff --git a/GameLibrary/Pages/Admin/Reviews/Index.cshtml b/GameLibrary/Pages/Admin/Reviews/Index.cshtml index 1974788..716aade 100644 --- a/GameLibrary/Pages/Admin/Reviews/Index.cshtml +++ b/GameLibrary/Pages/Admin/Reviews/Index.cshtml @@ -30,8 +30,8 @@ @foreach (var item in Model.Reviews!) { - @Html.DisplayFor(modelItem => item.GameId) - @Html.DisplayFor(modelItem => item.UserId) + @Html.DisplayFor(modelItem => item.User.UserName) + @Html.DisplayFor(modelItem => item.Game.Title) @Html.DisplayFor(modelItem => item.Rating) @Html.DisplayFor(modelItem => item.Content) From 9400d0250b7cc864ae74b25b2e365cf28ee901c2 Mon Sep 17 00:00:00 2001 From: Mathias Date: Sun, 8 Dec 2024 18:16:18 +0100 Subject: [PATCH 15/19] All admin CRUD fixed Fixed: - Remaining UserLib crud --- GameLibrary/Database.db-shm | Bin 32768 -> 32768 bytes GameLibrary/Database.db-wal | Bin 276072 -> 354352 bytes .../Pages/Admin/Reviews/Edit.cshtml.cs | 15 ++++- .../Pages/Admin/UserFavorites/Edit.cshtml.cs | 1 - .../Pages/Admin/UserLibraries/Create.cshtml | 35 ++++++----- .../Admin/UserLibraries/Create.cshtml.cs | 30 ++++++++-- .../Pages/Admin/UserLibraries/Edit.cshtml | 39 +++++++----- .../Pages/Admin/UserLibraries/Edit.cshtml.cs | 56 +++++++++++++----- .../Pages/Admin/UserLibraries/Index.cshtml | 4 +- 9 files changed, 128 insertions(+), 52 deletions(-) diff --git a/GameLibrary/Database.db-shm b/GameLibrary/Database.db-shm index 74d4dd46c65a5a01aaf5dac2e22fb7f66c495264..e7825ece08ed0b67bb21a7a8f86cfce8b97766e8 100644 GIT binary patch delta 342 zcmZo@U}|V!s+V}A%K!q55G)V|q&0zfv+l(1d8@DR@Hj|&l+Jk^P#2)}X>PE&KB?+~ zMu7py-2X@bD$K+Xw6Rf`(Nhx0mjYrnAXW!rV)!t%;z0EhK&%49s+%V=ez#wI#gUmY z7|2v--2BJ&8Y5!}g#F9o8Y8<4g9n2TLjX`jk#X}6?`w>#t_+?GzCgY*MyN>#W3w0c&A delta 234 zcmZo@U}|V!s+V}A%K!o#K+MR%Am9w7HGw!|@#hDtd^wl$I7oYx&Uqa0;jXgj`5(vQ zNmUOt3JmOlo1j1bl@4;br* dH;nbo?}!XU_E8Q@>_I+^b*~7Ksc1ppL?R;>U4 diff --git a/GameLibrary/Database.db-wal b/GameLibrary/Database.db-wal index 4fa79af1d2bf6def3d83e2644dcac9799b7b1ee2..269328ee7d4870073d35342dcf1b48f13943ff77 100644 GIT binary patch delta 1289 zcmaFyMqtAQ(S{br7N!>FEi4&kN(>APl0eMB;~?!(I_GhKChLt!S2p)(@B+mc`7;^# zGdCv+#PjPliZHT=hK4$GN;R&X}T(I3?3)3Bb8)9q&YF9%x;(xIISv%HWhag6P-5~*#R|jHEm_Hehzu<87wEeyP zf(SFSfILbVh*i59>fXtU2898G00SfplK8c!lMw*UBnQBAHgDs@9$!MZV7A`?#=u2> zcMWoaBG~`dtd5;k%4mi$YJfup6#FQl;$!YBq`#)56+<~FLNU_H#Z@~E=T*-80!b@b z4E$L@mnHzyiZD2>IC4rFIy;%00n>%9k)yeVu8E0@fv%IGg&Qz6Sh|@To4Qyy8JU99 zise;i6$`YWGPW|Z)H64+G&eTHo>Xk|w=K`!)^Hh`REV(*=wXzkvfe&ZKu zDzl|ZOrY);2c;`mHt<@wd*#t%qG1sC7cuY`0i!U3U#F3qkrkNQ9f4WZ)YZw%P&Y?2jyZ_Acp7i?uojad9JLU$F delta 17 YcmdmRLG;BNfrb{w7N!>FEi4&k07*~=;s5{u diff --git a/GameLibrary/Pages/Admin/Reviews/Edit.cshtml.cs b/GameLibrary/Pages/Admin/Reviews/Edit.cshtml.cs index 777c0c4..32350a4 100644 --- a/GameLibrary/Pages/Admin/Reviews/Edit.cshtml.cs +++ b/GameLibrary/Pages/Admin/Reviews/Edit.cshtml.cs @@ -1,5 +1,18 @@ +// Copyright 2024 Web.Tech. Group17 +// +// Licensed under the Apache License, Version 2.0 (the "License"): +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + using GameLibrary.Data; -using GameLibrary.Models; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.Mvc.Rendering; diff --git a/GameLibrary/Pages/Admin/UserFavorites/Edit.cshtml.cs b/GameLibrary/Pages/Admin/UserFavorites/Edit.cshtml.cs index e442176..1c2024a 100644 --- a/GameLibrary/Pages/Admin/UserFavorites/Edit.cshtml.cs +++ b/GameLibrary/Pages/Admin/UserFavorites/Edit.cshtml.cs @@ -13,7 +13,6 @@ // limitations under the License. using GameLibrary.Data; -using GameLibrary.Models; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.Mvc.Rendering; diff --git a/GameLibrary/Pages/Admin/UserLibraries/Create.cshtml b/GameLibrary/Pages/Admin/UserLibraries/Create.cshtml index 602b1c0..2ecd64c 100644 --- a/GameLibrary/Pages/Admin/UserLibraries/Create.cshtml +++ b/GameLibrary/Pages/Admin/UserLibraries/Create.cshtml @@ -17,34 +17,41 @@
      - - - +
      - - - +
      - - - + + +
      -
      - - - +
      + + +
      -
      +
      Back to List
      diff --git a/GameLibrary/Pages/Admin/UserLibraries/Create.cshtml.cs b/GameLibrary/Pages/Admin/UserLibraries/Create.cshtml.cs index 756a458..643db0f 100644 --- a/GameLibrary/Pages/Admin/UserLibraries/Create.cshtml.cs +++ b/GameLibrary/Pages/Admin/UserLibraries/Create.cshtml.cs @@ -32,6 +32,18 @@ public CreateModel(ApplicationDbContext context) public SelectList Games { get; set; } = null!; public SelectList Users { get; set; } = null!; + [BindProperty] + public Guid SelectedUserId { get; set; } + + [BindProperty] + public Guid SelectedGameId { get; set; } + + [BindProperty] + public string SelectedStatus { get; set; } = string.Empty; + + [BindProperty] + public bool SelectedIsUpcoming { get; set; } + public IActionResult OnGet() { Games = new SelectList(_context.Games, "Id", "Title"); @@ -39,18 +51,26 @@ public IActionResult OnGet() return Page(); } - [BindProperty] - public UserLibrary? UserLibrary { get; set; } - public async Task OnPostAsync() { if (!ModelState.IsValid) { + // Re-populate lists if there's a validation error + Games = new SelectList(_context.Games, "Id", "Title"); + Users = new SelectList(_context.Users, "Id", "UserName"); return Page(); } - UserLibrary!.AddedDate = DateTime.UtcNow; - _context.UserLibraries.Add(UserLibrary); + var userLibrary = new UserLibrary + { + UserId = SelectedUserId, + GameId = SelectedGameId, + Status = SelectedStatus, + IsUpcoming = SelectedIsUpcoming, + AddedDate = DateTime.UtcNow + }; + + _context.UserLibraries.Add(userLibrary); await _context.SaveChangesAsync(); return RedirectToPage("./Index"); diff --git a/GameLibrary/Pages/Admin/UserLibraries/Edit.cshtml b/GameLibrary/Pages/Admin/UserLibraries/Edit.cshtml index f6fad91..b35ac2a 100644 --- a/GameLibrary/Pages/Admin/UserLibraries/Edit.cshtml +++ b/GameLibrary/Pages/Admin/UserLibraries/Edit.cshtml @@ -15,37 +15,46 @@
      - + + +
      - - - +
      - - - +
      - - - + + +
      -
      - - - +
      + + +
      -
      +
      Back to List
      diff --git a/GameLibrary/Pages/Admin/UserLibraries/Edit.cshtml.cs b/GameLibrary/Pages/Admin/UserLibraries/Edit.cshtml.cs index 3dd5b2b..88b44d6 100644 --- a/GameLibrary/Pages/Admin/UserLibraries/Edit.cshtml.cs +++ b/GameLibrary/Pages/Admin/UserLibraries/Edit.cshtml.cs @@ -13,7 +13,6 @@ // limitations under the License. using GameLibrary.Data; -using GameLibrary.Models; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.Mvc.Rendering; @@ -30,12 +29,24 @@ public EditModel(ApplicationDbContext context) _context = context; } - [BindProperty] - public UserLibrary? UserLibrary { get; set; } - public SelectList? Games { get; set; } public SelectList? Users { get; set; } + [BindProperty] + public Guid SelectedId { get; set; } + + [BindProperty] + public Guid SelectedUserId { get; set; } + + [BindProperty] + public Guid SelectedGameId { get; set; } + + [BindProperty] + public string SelectedStatus { get; set; } = string.Empty; + + [BindProperty] + public bool SelectedIsUpcoming { get; set; } + public async Task OnGetAsync(Guid? id) { if (id == null) @@ -43,18 +54,21 @@ public async Task OnGetAsync(Guid? id) return NotFound(); } - UserLibrary = await _context.UserLibraries - .Include(ul => ul.Game) - .Include(ul => ul.User) - .FirstOrDefaultAsync(m => m.Id == id); - - if (UserLibrary == null) + var userLibrary = await _context.UserLibraries.AsNoTracking().FirstOrDefaultAsync(ul => ul.Id == id); + if (userLibrary == null) { return NotFound(); } - Games = new SelectList(_context.Games, "Id", "Title"); - Users = new SelectList(_context.Users, "Id", "UserName"); + // Populate the bound properties + SelectedId = userLibrary.Id; + SelectedUserId = userLibrary.UserId; + SelectedGameId = userLibrary.GameId; + SelectedStatus = userLibrary.Status; + SelectedIsUpcoming = userLibrary.IsUpcoming; + + Games = new SelectList(await _context.Games.ToListAsync(), "Id", "Title"); + Users = new SelectList(await _context.Users.ToListAsync(), "Id", "UserName"); return Page(); } @@ -63,10 +77,24 @@ public async Task OnPostAsync() { if (!ModelState.IsValid) { + Games = new SelectList(await _context.Games.ToListAsync(), "Id", "Title"); + Users = new SelectList(await _context.Users.ToListAsync(), "Id", "UserName"); return Page(); } - _context.Attach(UserLibrary!).State = EntityState.Modified; + var userLibrary = await _context.UserLibraries.FindAsync(SelectedId); + if (userLibrary == null) + { + return NotFound(); + } + + // Update the entity with the new values + userLibrary.UserId = SelectedUserId; + userLibrary.GameId = SelectedGameId; + userLibrary.Status = SelectedStatus; + userLibrary.IsUpcoming = SelectedIsUpcoming; + + _context.Attach(userLibrary).State = EntityState.Modified; try { @@ -74,7 +102,7 @@ public async Task OnPostAsync() } catch (DbUpdateConcurrencyException) { - if (!UserLibraryExists(UserLibrary!.Id)) + if (!UserLibraryExists(SelectedId)) { return NotFound(); } diff --git a/GameLibrary/Pages/Admin/UserLibraries/Index.cshtml b/GameLibrary/Pages/Admin/UserLibraries/Index.cshtml index 6d6f8f7..0128843 100644 --- a/GameLibrary/Pages/Admin/UserLibraries/Index.cshtml +++ b/GameLibrary/Pages/Admin/UserLibraries/Index.cshtml @@ -29,8 +29,8 @@ { - User: @Html.DisplayFor(modelItem => item.UserId)
      - Game: @Html.DisplayFor(modelItem => item.GameId)
      + User: @Html.DisplayFor(modelItem => item.User.UserName)
      + Game: @Html.DisplayFor(modelItem => item.Game.Title)
      Status: @Html.DisplayFor(modelItem => item.Status)
      Is Upcoming: @Html.DisplayFor(modelItem => item.IsUpcoming) From 788da5cb62543c8d403938790a258e82c3fd6412 Mon Sep 17 00:00:00 2001 From: Mathias Date: Sun, 8 Dec 2024 18:42:35 +0100 Subject: [PATCH 16/19] Add moderator pages with limited CRUD operations Add a new "Moderator" directory under "Pages" with limited CRUD operations for moderators. * **Layout and Navigation:** - Add `_Layout.cshtml` for moderator pages. - Add `_ManageNav.cshtml` for moderator navigation with links to Reviews and Users index pages. * **Reviews Management:** - Add `Index.cshtml` and `Index.cshtml.cs` for listing reviews with limited actions. - Add `Edit.cshtml` and `Edit.cshtml.cs` for approving or denying reviews. * **Users Management:** - Add `Index.cshtml` and `Index.cshtml.cs` for listing users with limited actions. - Add `Edit.cshtml` and `Edit.cshtml.cs` for editing user information. --- .../Pages/Moderator/Reviews/Edit.cshtml | 65 ++++++++++ .../Pages/Moderator/Reviews/Edit.cshtml.cs | 118 ++++++++++++++++++ .../Pages/Moderator/Reviews/Index.cshtml | 43 +++++++ .../Pages/Moderator/Reviews/Index.cshtml.cs | 26 ++++ GameLibrary/Pages/Moderator/Users/Edit.cshtml | 58 +++++++++ .../Pages/Moderator/Users/Edit.cshtml.cs | 70 +++++++++++ .../Pages/Moderator/Users/Index.cshtml | 37 ++++++ .../Pages/Moderator/Users/Index.cshtml.cs | 26 ++++ GameLibrary/Pages/Moderator/_Layout.cshtml | 25 ++++ GameLibrary/Pages/Moderator/_ManageNav.cshtml | 5 + 10 files changed, 473 insertions(+) create mode 100644 GameLibrary/Pages/Moderator/Reviews/Edit.cshtml create mode 100644 GameLibrary/Pages/Moderator/Reviews/Edit.cshtml.cs create mode 100644 GameLibrary/Pages/Moderator/Reviews/Index.cshtml create mode 100644 GameLibrary/Pages/Moderator/Reviews/Index.cshtml.cs create mode 100644 GameLibrary/Pages/Moderator/Users/Edit.cshtml create mode 100644 GameLibrary/Pages/Moderator/Users/Edit.cshtml.cs create mode 100644 GameLibrary/Pages/Moderator/Users/Index.cshtml create mode 100644 GameLibrary/Pages/Moderator/Users/Index.cshtml.cs create mode 100644 GameLibrary/Pages/Moderator/_Layout.cshtml create mode 100644 GameLibrary/Pages/Moderator/_ManageNav.cshtml diff --git a/GameLibrary/Pages/Moderator/Reviews/Edit.cshtml b/GameLibrary/Pages/Moderator/Reviews/Edit.cshtml new file mode 100644 index 0000000..eeb07dd --- /dev/null +++ b/GameLibrary/Pages/Moderator/Reviews/Edit.cshtml @@ -0,0 +1,65 @@ +@page +@model GameLibrary.Pages.Moderator.Reviews.EditModel + +@{ + ViewData["Title"] = "Edit Review"; +} + + + +
      +

      Edit Review

      +
      + +
      +
      + +
      + + + +
      + + + +
      + +
      + + + +
      + +
      + + + +
      + +
      + + + +
      + +
      + + + Back to List +
      + +
      +
      + + diff --git a/GameLibrary/Pages/Moderator/Reviews/Edit.cshtml.cs b/GameLibrary/Pages/Moderator/Reviews/Edit.cshtml.cs new file mode 100644 index 0000000..bb3672f --- /dev/null +++ b/GameLibrary/Pages/Moderator/Reviews/Edit.cshtml.cs @@ -0,0 +1,118 @@ +using GameLibrary.Data; +using GameLibrary.Models; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; +using Microsoft.AspNetCore.Mvc.Rendering; +using Microsoft.EntityFrameworkCore; + +namespace GameLibrary.Pages.Moderator.Reviews; + +public class EditModel : PageModel +{ + private readonly ApplicationDbContext _context; + + public EditModel(ApplicationDbContext context) + { + _context = context; + } + + public SelectList Games { get; set; } = null!; + public SelectList Users { get; set; } = null!; + + [BindProperty] + public Guid SelectedId { get; set; } + + [BindProperty] + public Guid SelectedGameId { get; set; } + + [BindProperty] + public Guid SelectedUserId { get; set; } + + [BindProperty] + public int SelectedRating { get; set; } + + [BindProperty] + public string? SelectedContent { get; set; } + + public async Task OnGetAsync(Guid? id) + { + if (id == null) + { + return NotFound(); + } + + var review = await _context.Reviews.AsNoTracking().FirstOrDefaultAsync(m => m.Id == id); + if (review == null) + { + return NotFound(); + } + + // Populate the bindable properties + SelectedId = review.Id; + SelectedGameId = review.GameId; + SelectedUserId = review.UserId; + SelectedRating = review.Rating; + SelectedContent = review.Content; + + Games = new SelectList(await _context.Games.ToListAsync(), "Id", "Title"); + Users = new SelectList(await _context.Users.ToListAsync(), "Id", "UserName"); + + return Page(); + } + + public async Task OnPostAsync(string submitButton) + { + if (!ModelState.IsValid) + { + Games = new SelectList(await _context.Games.ToListAsync(), "Id", "Title"); + Users = new SelectList(await _context.Users.ToListAsync(), "Id", "UserName"); + return Page(); + } + + var reviewToUpdate = await _context.Reviews.FindAsync(SelectedId); + if (reviewToUpdate == null) + { + return NotFound(); + } + + if (submitButton == "Approve") + { + reviewToUpdate.Status = "Approved"; + } + else if (submitButton == "Deny") + { + reviewToUpdate.Status = "Denied"; + } + + reviewToUpdate.GameId = SelectedGameId; + reviewToUpdate.UserId = SelectedUserId; + reviewToUpdate.Rating = SelectedRating; + reviewToUpdate.Content = SelectedContent ?? string.Empty; + reviewToUpdate.UpdatedAt = DateTime.UtcNow; + + _context.Attach(reviewToUpdate).State = EntityState.Modified; + + try + { + await _context.SaveChangesAsync(); + } + catch (DbUpdateConcurrencyException) + { + if (!ReviewExists(SelectedId)) + { + return NotFound(); + } + else + { + throw; + } + } + + return RedirectToPage("./Index"); + } + + private bool ReviewExists(Guid id) + { + return _context.Reviews.Any(e => e.Id == id); + } +} diff --git a/GameLibrary/Pages/Moderator/Reviews/Index.cshtml b/GameLibrary/Pages/Moderator/Reviews/Index.cshtml new file mode 100644 index 0000000..a7b45c0 --- /dev/null +++ b/GameLibrary/Pages/Moderator/Reviews/Index.cshtml @@ -0,0 +1,43 @@ +@page +@model GameLibrary.Pages.Moderator.Reviews.IndexModel + +@{ + ViewData["Title"] = "Moderator Reviews"; + ViewData["ActivePage"] = ManageNavPages.Reviews; +} + + + +
      +

      Reviews

      +
      + +
      + + + + + + + + + + + + @foreach (var item in Model.Reviews!) + { + + + + + + + + } + +
      GameUserRatingContentActions
      @Html.DisplayFor(modelItem => item.Game.Title)@Html.DisplayFor(modelItem => item.User.UserName)@Html.DisplayFor(modelItem => item.Rating)@Html.DisplayFor(modelItem => item.Content) + Approve/Deny +
      +
      + + diff --git a/GameLibrary/Pages/Moderator/Reviews/Index.cshtml.cs b/GameLibrary/Pages/Moderator/Reviews/Index.cshtml.cs new file mode 100644 index 0000000..565188e --- /dev/null +++ b/GameLibrary/Pages/Moderator/Reviews/Index.cshtml.cs @@ -0,0 +1,26 @@ +using GameLibrary.Data; +using GameLibrary.Models; +using Microsoft.AspNetCore.Mvc.RazorPages; +using Microsoft.EntityFrameworkCore; + +namespace GameLibrary.Pages.Moderator.Reviews; + +public class IndexModel : PageModel +{ + private readonly ApplicationDbContext _context; + + public IndexModel(ApplicationDbContext context) + { + _context = context; + } + + public IList? Reviews { get; set; } + + public async Task OnGetAsync() + { + Reviews = await _context.Reviews + .Include(r => r.Game) + .Include(r => r.User) + .ToListAsync(); + } +} diff --git a/GameLibrary/Pages/Moderator/Users/Edit.cshtml b/GameLibrary/Pages/Moderator/Users/Edit.cshtml new file mode 100644 index 0000000..58881c8 --- /dev/null +++ b/GameLibrary/Pages/Moderator/Users/Edit.cshtml @@ -0,0 +1,58 @@ +@page +@model GameLibrary.Pages.Moderator.Users.EditModel + +@{ + ViewData["Title"] = "Edit User"; +} + +
      +

      Edit User

      +
      + +
      +
      +
      + + +
      + + + +
      + +
      + + + +
      + +
      + + + +
      + +
      + + + +
      + +
      + + + +
      + +
      + + + +
      + +
      + + Back to List +
      +
      +
      diff --git a/GameLibrary/Pages/Moderator/Users/Edit.cshtml.cs b/GameLibrary/Pages/Moderator/Users/Edit.cshtml.cs new file mode 100644 index 0000000..2c8c9a9 --- /dev/null +++ b/GameLibrary/Pages/Moderator/Users/Edit.cshtml.cs @@ -0,0 +1,70 @@ +using GameLibrary.Data; +using GameLibrary.Models; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; +using Microsoft.EntityFrameworkCore; + +namespace GameLibrary.Pages.Moderator.Users; + +public class EditModel : PageModel +{ + private readonly ApplicationDbContext _context; + + public EditModel(ApplicationDbContext context) + { + _context = context; + } + + [BindProperty] + public User User { get; set; } = null!; + + public async Task OnGetAsync(Guid? id) + { + if (id == null) + { + return NotFound(); + } + + User = await _context.Users.FirstOrDefaultAsync(m => m.Id == id); + + if (User == null) + { + return NotFound(); + } + + return Page(); + } + + public async Task OnPostAsync() + { + if (!ModelState.IsValid) + { + return Page(); + } + + _context.Attach(User).State = EntityState.Modified; + + try + { + await _context.SaveChangesAsync(); + } + catch (DbUpdateConcurrencyException) + { + if (!UserExists(User.Id)) + { + return NotFound(); + } + else + { + throw; + } + } + + return RedirectToPage("./Index"); + } + + private bool UserExists(Guid id) + { + return _context.Users.Any(e => e.Id == id); + } +} diff --git a/GameLibrary/Pages/Moderator/Users/Index.cshtml b/GameLibrary/Pages/Moderator/Users/Index.cshtml new file mode 100644 index 0000000..ebde7c6 --- /dev/null +++ b/GameLibrary/Pages/Moderator/Users/Index.cshtml @@ -0,0 +1,37 @@ +@page +@model GameLibrary.Pages.Moderator.Users.IndexModel + +@{ + ViewData["Title"] = "Users"; + ViewData["ActivePage"] = ManageNavPages.Users; +} + +
      +

      Users

      +
      + +
      + + + + + + + + + + + @foreach (var item in Model.IdentityUsers!) + { + + + + + + + } + +
      User NameEmailRoleActions
      @item.UserName@item.Email@(Model.UserRoles.ContainsKey(item.Id) ? Model.UserRoles[item.Id] : "No Role") + Edit +
      +
      diff --git a/GameLibrary/Pages/Moderator/Users/Index.cshtml.cs b/GameLibrary/Pages/Moderator/Users/Index.cshtml.cs new file mode 100644 index 0000000..65dbfa3 --- /dev/null +++ b/GameLibrary/Pages/Moderator/Users/Index.cshtml.cs @@ -0,0 +1,26 @@ +using GameLibrary.Data; +using GameLibrary.Models; +using Microsoft.AspNetCore.Identity; +using Microsoft.AspNetCore.Mvc.RazorPages; +using Microsoft.EntityFrameworkCore; + +namespace GameLibrary.Pages.Moderator.Users; + +public class IndexModel(ApplicationDbContext context, UserManager userManager) : PageModel +{ + public IList IdentityUsers { get; set; } = []; + public Dictionary UserRoles { get; set; } = []; + + public async Task OnGetAsync() + { + // Fetch all users + IdentityUsers = await context.Users.ToListAsync(); + + // Fetch roles for each user + foreach (var user in IdentityUsers) + { + var roles = await userManager.GetRolesAsync(user); + UserRoles[user.Id] = roles.FirstOrDefault() ?? "No Role"; + } + } +} diff --git a/GameLibrary/Pages/Moderator/_Layout.cshtml b/GameLibrary/Pages/Moderator/_Layout.cshtml new file mode 100644 index 0000000..4d7ed2c --- /dev/null +++ b/GameLibrary/Pages/Moderator/_Layout.cshtml @@ -0,0 +1,25 @@ +@{ + if (ViewData.TryGetValue("ParentLayout", out var parentLayout) && parentLayout != null) + { + Layout = parentLayout.ToString(); + } + else + { + Layout = "/Pages/Shared/_Layout.cshtml"; + } +} + +
      +
      +
      + +
      +
      + @RenderBody() +
      +
      +
      + +@section Scripts { + @RenderSection("Scripts", required: false) +} diff --git a/GameLibrary/Pages/Moderator/_ManageNav.cshtml b/GameLibrary/Pages/Moderator/_ManageNav.cshtml new file mode 100644 index 0000000..46e3a37 --- /dev/null +++ b/GameLibrary/Pages/Moderator/_ManageNav.cshtml @@ -0,0 +1,5 @@ + From f9b10795e8f725c71e3052091964bc44a58958f8 Mon Sep 17 00:00:00 2001 From: Mathias Date: Sun, 8 Dec 2024 18:46:56 +0100 Subject: [PATCH 17/19] Add a navigation pages file for moderator * Include navigation logic for Reviews and Users * Define methods to get navigation class for Index, Reviews, and Users pages * Implement logic to determine active page based on ViewContext --- GameLibrary/Pages/Moderator/ManageNavPages.cs | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 GameLibrary/Pages/Moderator/ManageNavPages.cs diff --git a/GameLibrary/Pages/Moderator/ManageNavPages.cs b/GameLibrary/Pages/Moderator/ManageNavPages.cs new file mode 100644 index 0000000..b326199 --- /dev/null +++ b/GameLibrary/Pages/Moderator/ManageNavPages.cs @@ -0,0 +1,21 @@ +using Microsoft.AspNetCore.Mvc.Rendering; + +namespace GameLibrary.Pages.Moderator; + +public static class ManageNavPages +{ + public static string Index => "Index"; + public static string Reviews => "Reviews/Index"; + public static string Users => "Users/Index"; + + public static string IndexNavClass(ViewContext viewContext) => PageNavClass(viewContext, Index); + public static string ReviewsNavClass(ViewContext viewContext) => PageNavClass(viewContext, Reviews); + public static string UsersNavClass(ViewContext viewContext) => PageNavClass(viewContext, Users); + + public static string PageNavClass(ViewContext viewContext, string page) + { + var activePage = viewContext.ViewData["ActivePage"] as string + ?? System.IO.Path.GetFileNameWithoutExtension(viewContext.ActionDescriptor.DisplayName); + return string.Equals(activePage, page, StringComparison.OrdinalIgnoreCase) ? "active" : null; + } +} From 96b8d899ae8b7b836da92ecc7453045d0dc2ecd0 Mon Sep 17 00:00:00 2001 From: Mathias Date: Sun, 8 Dec 2024 18:52:19 +0100 Subject: [PATCH 18/19] Add moderator index page and code-behind file * **Index.cshtml** - Add a page to display the moderator dashboard - Display total reviews and total users - Include a chart for review ratings * **Index.cshtml.cs** - Add a code-behind file to fetch and display summary information for moderators - Fetch total reviews and total users - Fetch review ratings and group them by rating --- GameLibrary/Pages/Moderator/Index.cshtml | 55 +++++++++++++++++++++ GameLibrary/Pages/Moderator/Index.cshtml.cs | 30 +++++++++++ 2 files changed, 85 insertions(+) create mode 100644 GameLibrary/Pages/Moderator/Index.cshtml create mode 100644 GameLibrary/Pages/Moderator/Index.cshtml.cs diff --git a/GameLibrary/Pages/Moderator/Index.cshtml b/GameLibrary/Pages/Moderator/Index.cshtml new file mode 100644 index 0000000..296a888 --- /dev/null +++ b/GameLibrary/Pages/Moderator/Index.cshtml @@ -0,0 +1,55 @@ +@page +@model GameLibrary.Pages.Moderator.IndexModel + +@{ + ViewData["Title"] = "Moderator Index"; + ViewData["ActivePage"] = ManageNavPages.Index; +} + +

      Moderator Dashboard

      + +
      +
      +
      +
      Total Reviews
      +
      +
      @Model.TotalReviews
      +
      +
      +
      +
      +
      +
      Total Users
      +
      +
      @Model.TotalUsers
      +
      +
      +
      +
      + +
      +
      +

      Review Ratings

      + +
      +
      + +@section Scripts { + + +} diff --git a/GameLibrary/Pages/Moderator/Index.cshtml.cs b/GameLibrary/Pages/Moderator/Index.cshtml.cs new file mode 100644 index 0000000..60ea3aa --- /dev/null +++ b/GameLibrary/Pages/Moderator/Index.cshtml.cs @@ -0,0 +1,30 @@ +using GameLibrary.Data; +using Microsoft.AspNetCore.Mvc.RazorPages; +using Microsoft.EntityFrameworkCore; + +namespace GameLibrary.Pages.Moderator; + +public class IndexModel : PageModel +{ + private readonly ApplicationDbContext _context; + + public IndexModel(ApplicationDbContext context) + { + _context = context; + } + + public int TotalReviews { get; set; } + public int TotalUsers { get; set; } + + public Dictionary ReviewRatings { get; set; } = new(); + + public async Task OnGetAsync() + { + TotalReviews = await _context.Reviews.CountAsync(); + TotalUsers = await _context.Users.CountAsync(); + + ReviewRatings = await _context.Reviews + .GroupBy(r => r.Rating) + .ToDictionaryAsync(r => r.Key, r => r.Count()); + } +} From 128569b09f496a8b0f15ae44bff82554f0b2d68f Mon Sep 17 00:00:00 2001 From: Mathias Date: Sun, 8 Dec 2024 19:33:28 +0100 Subject: [PATCH 19/19] Add Moderator Role Added: - Seeded Moderator role - Restriction of moderator pages - Moved Role tools into its own tab/section/page --- GameLibrary/Data/DbInitializer.cs | 31 +++++++++-- GameLibrary/Database.db-shm | Bin 32768 -> 32768 bytes GameLibrary/Database.db-wal | Bin 354352 -> 329632 bytes GameLibrary/Pages/Account/Manage/Index.cshtml | 5 -- .../Pages/Account/Manage/Index.cshtml.cs | 3 -- .../Pages/Account/Manage/ManageNavPages.cs | 10 ++++ .../Pages/Account/Manage/RoleTools.cshtml | 39 ++++++++++++++ .../Pages/Account/Manage/RoleTools.cshtml.cs | 33 ++++++++++++ .../Pages/Account/Manage/_ManageNav.cshtml | 1 + .../Pages/Moderator/Reviews/Edit.cshtml | 13 +++-- .../Pages/Moderator/Reviews/Edit.cshtml.cs | 48 ++++++++++-------- GameLibrary/Program.cs | 3 ++ 12 files changed, 152 insertions(+), 34 deletions(-) create mode 100644 GameLibrary/Pages/Account/Manage/RoleTools.cshtml create mode 100644 GameLibrary/Pages/Account/Manage/RoleTools.cshtml.cs diff --git a/GameLibrary/Data/DbInitializer.cs b/GameLibrary/Data/DbInitializer.cs index 2f6d0a1..2dd6ad6 100644 --- a/GameLibrary/Data/DbInitializer.cs +++ b/GameLibrary/Data/DbInitializer.cs @@ -30,9 +30,16 @@ public static void Initialize(this IApplicationBuilder app) var roleManager = services.GetRequiredService>(); // Apply any pending migrations - if (context.Database.GetPendingMigrations().Any()) + try { - context.Database.Migrate(); + if (context.Database.GetPendingMigrations().Any()) + { + context.Database.Migrate(); + } + } + catch (Exception ex) + { + Console.WriteLine($"Migration error: {ex.Message}"); } // Check if we already have games @@ -42,7 +49,7 @@ public static void Initialize(this IApplicationBuilder app) } // Ensure roles are created - var roles = new[] { "Administrator", "User" }; + var roles = new[] { "Administrator", "User", "Moderator" }; foreach (var role in roles) { if (!roleManager.RoleExistsAsync(role).Result) @@ -68,6 +75,24 @@ public static void Initialize(this IApplicationBuilder app) } } + var moderatorUser = new User + { + Id = Guid.Parse("71a23c2d-f82e-4b47-a843-cfcadbd65a77"), + UserName = "moderator@example.com", + Email = "moderator@example.com", + EmailConfirmed = true + }; + + if (userManager.FindByNameAsync(moderatorUser.UserName).Result == null) + { + var result = userManager.CreateAsync(moderatorUser, "Password123!").Result; + if (result.Succeeded) + { + userManager.AddToRoleAsync(moderatorUser, "Moderator").Wait(); + } + } + + context.SaveChanges(); // Add test games diff --git a/GameLibrary/Database.db-shm b/GameLibrary/Database.db-shm index e7825ece08ed0b67bb21a7a8f86cfce8b97766e8..4511a9573c86c2aac0b0b9fb7b3421371269d74e 100644 GIT binary patch delta 460 zcmb7=%PWLo6o-Gmx%A0OV}nQD`7!E zFiaLm(y0>uC{>J3s?R{0G!5mbM2$3@l10frEekGG!JTyKIOwA0K_lAGDdvP)F)C1v zS}E+bW}^;1!7$a~sEh0qKBqbu6Yf{<;}M!$;1^j&^*j-!Ru3=Q(IcjW>SN5NZHFNNvAaz&FD@UJ!#b4TxQdo`Ac#@?Jj(o T*s6}c-NZM#=_O`e7u(ao-CKLog5VQ@XMNqbGC2p%t?OMhC z7owm|NFptwMMXrksZ9_?9cKz!)`5@teLv2<+)1URR7%>k+;~wKGE$b{ubU&h>FvG4 zoY@?#3MY4NwGFNQWjE&c{db?Q(x-6m=dbzJ5~As?(@dOPnFDe}tgLOEI*!WuOaIxe zcXrqsZTCPpX8rD$Quk~m3th9@$(9Saqx6CZ7z7oOOL1{a5S4PZP>@5>1z}%LCS#}YXm)F>+*-RbQ&XMy zz5jdv@%`_;Er%1ITGEGOgR%21*vGe8EG~=wv}Zi@-QNbCICyaCuw!nJUJ74Xjqe|^ zH?Fjk*ETGhhbO;K^*QS51Y{lVJ?X9HHP3}gTn<;S&bMb`-&^r~Opn&?p;DL4mDpvf z3)YMFi*oPW&^+AXiq3O{Ex&ufbFp}6)~yQ9e^H20PfiD@4t26?oi_q1K_fcKJ&$+ z<7RaLoJPQ(isG#YZ&^7c^wfESOM|PQ^NgJJ;_-+}Q6r)-sX?3Z@U5tJxR=!cnYZl` z?W3jHy&{laM#$Q!ZO%vgz4H84(umj>bF6;)h4Zx$M1m2qfoyLH9DXBN!^y-3Yn1?r3loH|Na=Bn?8+I*a+5ZAbAw z_gn91uH_IC4gAnLxpwZC#~#ztpRu*0gK$QX7=Y6lF3BQBu?miHEX!k*DAO`d0ahm3 zoG;o2Me(0|hu8T>ChXnH#hgI1ei=Ha2nxl$%uW8KcQG>h4_^zU?0 zNx`DNN92Uw-6204y4ivrM>mH&uJveLI^wpPp@ny8-WH#B5_b5G!+%gN|{hmTt?a;Ix*2=W@$g_-2pd~D(Ch*Fy)U= zf7(kc>1$tv2F*}L{(Fv3iu6jSZ~XQhYi#}Xpd;vU3wjQQ{Zr`O{b;-sNw!9vg|xNW zk<@777v9x+H9t7uBkiwt1Vs}`4Chh^ZUp=zso^X`^EgMeT}wbx^)C?21A#Knl)0IH zby7iXF(~By1p-%5Kcj}6JFVJ_H`W86r(t46T}=&BCKk@foy;rB>`CR5GfRZhiU!&* zWM?Y^U6flAZj};0k0hw1>tX44$Q|$J6$y(0O_^^PV31Ae>GgvL|^<#8^ z;!|j%)<@B`KDf#*opaxJ6A?$1a@o}ly2jX?3oY>noC{$M z-0uv|7i@jqPWVVHeBzqvBDcliu*5l7LLh-e%9zTL3TzM*iwPVBFiDjJS(F)CV4-G{ z6h?Hd4W8vGk|OFm)o7G|wx_;vihsDbp*~t{qm*i)sH9LC9+ZlUOb&%3g;D`Nd4e$3 zGeQ5Q$nL-lwo$E~Svq^_1f{6PSCv1#K3|zwRqCx|8$1j>&0AhIV`iYf4zHWwEf`x< zD$%7ClgCUBG|kDJz{!G|on2X7MV6@rW5|j;x=3Ve$nx@XX>@UAt|;e?kr~R*;{cE( zfd#w)9QMpw2IGBj-5f!XKEg||crD-7l7L9R29fx=su*UdiY_8?@`=H_9~sm$a6@BE z*Y(*<_XV%>)=;TOTAd zPLPZ8#u(qiIlBndwi)lY9DV4|6*o+L+fPs2c1A{$qSbJ=Y4Is-aN?fds^R9V!RrTJ zKtkDNfuDl1>+xZ=-dYv|1nZ?ZHsA}8)c;&HbmyUo?C8IrcP zEB7H8W*K&Aa!0@3ThaS1?(hww64XV-l<}L`ZFiBL5w5S#zCV4nVpIrSnmV4)WY^38 zu?Xc)U%9e1QBCZRU{=sQCV8n z4r$0z>tIo(cvX@BCbKNuXNe3P%JKjM60UN9WLY4R+JoDWNmej6*6FTlxf_FgGHBos zcsLboofxlB96Z#CJSHeOi^(J-k(?+?KxVWvJCKc5&?Cm_&RtMC5F&@NSq_F28C->j zQ$RtE6eZKJ+X8@*s>+Hu&EP;KwN00h8Y^hQ?M^q*N`#FPtb+y|CE+;i(F_ybwm`Zx z$zT$v0A8jTMwGRQyAi7mq#{mtUQ1E}vF>eL=v(k1!z--Q}6(8Byk{6 zoWy8x7m+3_AZ<>!)RJ}wM5ghygH$-4Q{lN4=SUiE%n5yO0Lhbp!xfolRZbPOhSNy1 zm0FN&b-D`{1T!EsGmUl-gsiHPs$vQwK*O9K@ zado-pn*E2(P$yMWpzkNHcKpEJg?%BtpTXA}_!dsWb%-_A=yzlRfn6lSP5X zdB8ytCjmyutcYXZdar(e;LIr;zqa5MNH<3@>^nqs5CsrRA z&6eQLq)UuG(nNA7c733kWC$N#yTm^D6TuH(8<+{T9%J~4?xE^;WjU)4BGdF%6lWP{ ziNB}k#vXQ~5a^?$&$6j5>Ni#R|51gh*1<6L8TzNQb(HN3zCC2u0WrLJ>ABnz&-Ppn z`_jUm)Pj^Ay2jS0LFr+kYN;l~LR;OAG+Ke$9g0>0d2+qPZ|%r-wLmENK7ufzBLAkZ|J7_abp_x4SvRDp^!s;aFN^Fh#~C*ve=Q z<0uipOF>CtC6aJVM=t8j_&Th0 zW;_&@Iy38ngi^z#(8xvIg^kqRw~d=p7GY%~uu7PfnSo(eW(Gn=`rUm-dnc>=&t83! QY+U|M2dlOVw0-8k010RkPyhe` delta 6381 zcmeHM3s6+o8QvGT2ybC+dvS8H=^XFBancV?NL zJLfz9f4=`a-}%p_W8F1feK8!{6u#0ze15&f;<4zTsI2kX4O@;C#M-2|q+X53kF3V$ z#Ybkna^lpDv71(axZTAk-JW5<_|bgJYbS03-31<}CwlnlI}Z`r@!LLYAK6{#v3X)b zrkap5uco&b)poA{PET;2Gf$VtEn0w1bU&G8c>3BJs`SX#);GJm3Jg!xXLd9t9^c=H zW7<72Va7a-r6V>SdGe zD;XS{KLl_Y0jC;IymxE)*3sP^-xw$z{Z@{BZC6A=fKs;+!A{;)c>G9To7NX?H9+#u zJa_UKTI&r!qC+4nulsKK-iwENC?n#TJNEBlz97a05MzvpE!)4GoO!YKxCU;;kYM4! z1Jl=aiK~0G>@wryHSZ^9-pl9vw7cq!0Y2z?{ai-OU|b-;b;bav^Bz6c89lB{Tffl= zdABDfqp#*bd;l`m2r1mAdHY{<9M^ug#|TL*`u))hsa@X(AmfdYXAkT=dH&n2i?uWF z8zH&!#eLUL-*zqli8Vr^ZX9=Ven<8*TKu<0h~>T2M@O|zj}AcMjF7+PH+wxRyB25# zV{C?sd~*IV;lTd0c>%}`Mo77u)*1iD&kt)Wpb@fV%EL!j-jvfBfFu|pUw@@mSJS7D zXQdy)w}jkEfhF|#d=tyvkdGod!?En{X$UHwaTWo~TH z>JHh~x{HCzs(?ov!I3;mAW>!rffq#rlAMfWLFRdq^ewKa_svjlm961ES8}q&L^l4_ zj2k9tvoNQ#So`G@BXNE<_b!Wjmlm(sx4Ek)+I?0t8Q7BTz6cXxFC$^hz_qUEy4Fao z#GTwCT5~Xs()9mA|O6q^3AGMWj<2bIa4_Ev708q{W4$xzn;M z=a%G_(@QfmrJN$=76q0R7qP|DMQJ7@W-C*RXi+XKoF-=HNqi}o3#igEg6GQ+RtX1) zGQJ!U<$PsDJXyw-(^Po{UOh!q#?dVV?f@Qc@N@vGuI|+`2jcHKgD=uw-Q!NwA2nAW&%qNpK8RN$?f0{Dz7$ zy1W#Y&c&pJc>XtcCWw1H>-${VhF1F?cUwxU-D`Fe`Oo}ely=jnsf>(5O@VD1j#Gd$7Gr#c!aQ-0hyI#Q4u7TE2v&pu`qsWX+zDDg%wNELBPmAZDTa_ak|-1fWTVl^KZ_1ybAbwxiXGR^1ln@)fttCNR`XLnjLaMUn)G5CoPc@ah@FYq0O=1(vQCHqKoSWEm61pSF_KDfEK&$wKng&zDnnJfxXxjDiLwwdi5fVIwYf3{(kOfAD zEaFD$1I=hH!aq6@-ld;g(nrqp_k@i%BUvu}D~z+3s@uk^+{0z1N}oTy)qY`CIHq+O*;Xb(P!H{buw z;D5{vnyrag4_^H{e40!>etid;QafH3iY=?r(7;AVy%k1|)LpLd28>K$Gn{5jL#tiuD6!s%vxvdpppJXvwfnf`DNa2-yK9QY z{qs=?t|>S{(gm7J?GZkoubHq)78UZ?Nbw0nAqJl{ib&!POvOhJLJ|@<1QDyWfmVBB zf{6{<_SK&pvlQ&5V7Qy4QxTwOnx~qV+59nY$1z0}aHN2P&@>70ajIa`WJvr+1*)n* zR^@2Xe9SWgj#?a(GY+=ANVOhqSuGjz`>0CfN3yoEeJz9%p7H|&Frhq@n~s0-TauC}+U0rN zhp_k;FUceURlp#bAz4a<{u0kN(SfDXXz7F4(@G zCs9`v?1p!fKkQstvieFiI{))DhH%hIyk{XOv#)l( z{Z7oxAr9&-?s_bxD)-IJk=8K0Zv|{jv?9{@3We`X_;ShNdmkyYgoG4Gv$O(OFeIdz zW=eF4kmz&-QW<e$oYTm~)gkqtz5)S(^iL+>dP&8+b6sZf?R diff --git a/GameLibrary/Pages/Account/Manage/Index.cshtml b/GameLibrary/Pages/Account/Manage/Index.cshtml index dc78fb2..d774475 100644 --- a/GameLibrary/Pages/Account/Manage/Index.cshtml +++ b/GameLibrary/Pages/Account/Manage/Index.cshtml @@ -22,10 +22,5 @@
      - - @if (Model.IsAdminRole) - { - Admin Dashboard - }
      diff --git a/GameLibrary/Pages/Account/Manage/Index.cshtml.cs b/GameLibrary/Pages/Account/Manage/Index.cshtml.cs index 28b8bf2..693c235 100644 --- a/GameLibrary/Pages/Account/Manage/Index.cshtml.cs +++ b/GameLibrary/Pages/Account/Manage/Index.cshtml.cs @@ -35,7 +35,6 @@ public IndexModel( _signInManager = signInManager; } - public bool IsAdminRole { get; set; } /// /// This API supports the ASP.NET Core Identity default UI infrastructure and is not intended to be used /// directly from your code. This API may change or be removed in future releases. @@ -92,8 +91,6 @@ public async Task OnGetAsync() return NotFound($"Unable to load user with ID '{_userManager.GetUserId(User)}'."); } - IsAdminRole = _userManager.IsInRoleAsync(user, "Administrator").Result; - await LoadAsync(user); return Page(); } diff --git a/GameLibrary/Pages/Account/Manage/ManageNavPages.cs b/GameLibrary/Pages/Account/Manage/ManageNavPages.cs index 4ef9be9..6d36434 100644 --- a/GameLibrary/Pages/Account/Manage/ManageNavPages.cs +++ b/GameLibrary/Pages/Account/Manage/ManageNavPages.cs @@ -72,6 +72,11 @@ public static class ManageNavPages /// public static string TwoFactorAuthentication => "TwoFactorAuthentication"; + /// + /// This API supports the ASP.NET Core Identity default UI infrastructure and is not intended to be used + /// + public static string RoleTools => "RoleTools"; + /// /// This API supports the ASP.NET Core Identity default UI infrastructure and is not intended to be used /// directly from your code. This API may change or be removed in future releases. @@ -120,6 +125,11 @@ public static class ManageNavPages /// public static string TwoFactorAuthenticationNavClass(ViewContext viewContext) => PageNavClass(viewContext, TwoFactorAuthentication); + /// + /// This API supports the ASP.NET Core Identity default UI infrastructure and is not intended to be used + /// + public static string RoleToolsNavClass(ViewContext viewContext) => PageNavClass(viewContext, RoleTools); + /// /// This API supports the ASP.NET Core Identity default UI infrastructure and is not intended to be used /// directly from your code. This API may change or be removed in future releases. diff --git a/GameLibrary/Pages/Account/Manage/RoleTools.cshtml b/GameLibrary/Pages/Account/Manage/RoleTools.cshtml new file mode 100644 index 0000000..8990153 --- /dev/null +++ b/GameLibrary/Pages/Account/Manage/RoleTools.cshtml @@ -0,0 +1,39 @@ +@page +@model RoleToolsModel +@{ + ViewData["Title"] = "Role-Based Tools"; + ViewData["ActivePage"] = ManageNavPages.RoleTools; +} + +
      +
      +
      +
      +
      +

      Role-Based Tools

      +
      +
      +

      Access tools and dashboards based on your roles.

      +
      + @if (Model.IsAdminRole) + { + + Admin Dashboard + + } + @if (Model.IsModeratorRole) + { + + Moderator Dashboard + + } + @if (!Model.IsAdminRole && !Model.IsModeratorRole) + { +

      You do not have any role-based tools available.

      + } +
      +
      +
      +
      +
      +
      diff --git a/GameLibrary/Pages/Account/Manage/RoleTools.cshtml.cs b/GameLibrary/Pages/Account/Manage/RoleTools.cshtml.cs new file mode 100644 index 0000000..ac6f070 --- /dev/null +++ b/GameLibrary/Pages/Account/Manage/RoleTools.cshtml.cs @@ -0,0 +1,33 @@ +using Microsoft.AspNetCore.Identity; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; +using GameLibrary.Models; + +namespace GameLibrary.Pages.Account.Manage; + +public class RoleToolsModel : PageModel +{ + private readonly UserManager _userManager; + + public RoleToolsModel(UserManager userManager) + { + _userManager = userManager; + } + + public bool IsAdminRole { get; set; } + public bool IsModeratorRole { get; set; } + + public async Task OnGetAsync() + { + var user = await _userManager.GetUserAsync(User); + if (user == null) + { + return NotFound($"Unable to load user with ID '{_userManager.GetUserId(User)}'."); + } + + IsAdminRole = await _userManager.IsInRoleAsync(user, "Administrator"); + IsModeratorRole = await _userManager.IsInRoleAsync(user, "Moderator"); + + return Page(); + } +} diff --git a/GameLibrary/Pages/Account/Manage/_ManageNav.cshtml b/GameLibrary/Pages/Account/Manage/_ManageNav.cshtml index 6d8f6ec..ea4670c 100644 --- a/GameLibrary/Pages/Account/Manage/_ManageNav.cshtml +++ b/GameLibrary/Pages/Account/Manage/_ManageNav.cshtml @@ -12,4 +12,5 @@ }
    • Two-factor authentication
    • Personal data
      • +
    • Role-Based Tools
    diff --git a/GameLibrary/Pages/Moderator/Reviews/Edit.cshtml b/GameLibrary/Pages/Moderator/Reviews/Edit.cshtml index eeb07dd..dc73518 100644 --- a/GameLibrary/Pages/Moderator/Reviews/Edit.cshtml +++ b/GameLibrary/Pages/Moderator/Reviews/Edit.cshtml @@ -13,6 +13,13 @@
    + @if (ViewData["Status"] != null) + { +
    + Current Status: @ViewData["Status"] +
    + } +
    @@ -54,9 +61,9 @@
    - - - Back to List + + + Back to List
    diff --git a/GameLibrary/Pages/Moderator/Reviews/Edit.cshtml.cs b/GameLibrary/Pages/Moderator/Reviews/Edit.cshtml.cs index bb3672f..d485202 100644 --- a/GameLibrary/Pages/Moderator/Reviews/Edit.cshtml.cs +++ b/GameLibrary/Pages/Moderator/Reviews/Edit.cshtml.cs @@ -11,6 +11,8 @@ public class EditModel : PageModel { private readonly ApplicationDbContext _context; + public static Dictionary ReviewStatuses { get; set; } = []; + public EditModel(ApplicationDbContext context) { _context = context; @@ -47,7 +49,6 @@ public async Task OnGetAsync(Guid? id) return NotFound(); } - // Populate the bindable properties SelectedId = review.Id; SelectedGameId = review.GameId; SelectedUserId = review.UserId; @@ -57,6 +58,16 @@ public async Task OnGetAsync(Guid? id) Games = new SelectList(await _context.Games.ToListAsync(), "Id", "Title"); Users = new SelectList(await _context.Users.ToListAsync(), "Id", "UserName"); + // Retrieve status from the dictionary, if exists + if (ReviewStatuses.TryGetValue(SelectedId, out var status)) + { + ViewData["Status"] = status; + } + else + { + ViewData["Status"] = "Pending"; // Default status + } + return Page(); } @@ -75,37 +86,34 @@ public async Task OnPostAsync(string submitButton) return NotFound(); } + // Update the status in the dictionary if (submitButton == "Approve") { - reviewToUpdate.Status = "Approved"; + ReviewStatuses[SelectedId] = "Approved"; + + // Update review details + reviewToUpdate.GameId = SelectedGameId; + reviewToUpdate.UserId = SelectedUserId; + reviewToUpdate.Rating = SelectedRating; + reviewToUpdate.Content = SelectedContent ?? string.Empty; + reviewToUpdate.UpdatedAt = DateTime.UtcNow; + + _context.Attach(reviewToUpdate).State = EntityState.Modified; } else if (submitButton == "Deny") { - reviewToUpdate.Status = "Denied"; - } + ReviewStatuses[SelectedId] = "Denied"; - reviewToUpdate.GameId = SelectedGameId; - reviewToUpdate.UserId = SelectedUserId; - reviewToUpdate.Rating = SelectedRating; - reviewToUpdate.Content = SelectedContent ?? string.Empty; - reviewToUpdate.UpdatedAt = DateTime.UtcNow; - - _context.Attach(reviewToUpdate).State = EntityState.Modified; + _context.Reviews.Remove(reviewToUpdate); + } try { await _context.SaveChangesAsync(); } - catch (DbUpdateConcurrencyException) + catch (DbUpdateConcurrencyException) when (!ReviewExists(SelectedId)) { - if (!ReviewExists(SelectedId)) - { - return NotFound(); - } - else - { - throw; - } + return NotFound(); } return RedirectToPage("./Index"); diff --git a/GameLibrary/Program.cs b/GameLibrary/Program.cs index 6cc7c2f..8ebbfc9 100644 --- a/GameLibrary/Program.cs +++ b/GameLibrary/Program.cs @@ -46,10 +46,13 @@ public static void Main(string[] args) .AddRazorPagesOptions(options => { options.Conventions.AuthorizeFolder("/Admin", "RequireAdministratorRole"); + options.Conventions.AuthorizeFolder("/Moderator", "RequireModeratorRole"); }); + builder.Services.AddAuthorization(options => { options.AddPolicy("RequireAdministratorRole", policy => policy.RequireRole("Administrator")); + options.AddPolicy("RequireModeratorRole", policy => policy.RequireRole("Moderator")); }); builder.Services.AddResponseCompression(options =>