dimitar/rent-a-car
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UsersController returns! Design updates

Browse Source
This commit is contained in:
Dimitar Byalkov
2022-04-08 22:09:31 +03:00
parent c9777042c0
commit 8935dbdc99
10 changed files with 361 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
RentACar/WebApp/Controllers/CarsController.cs
View File

@@ -20,14 +20,14 @@ namespace WebApp.Controllers
{
_context = context;
}
[Authorize]
public async Task<IActionResult> Index()
{
return View(await _context.Cars.ToListAsync());
}
// GET: Cars/Details/5
[Authorize]
public async Task<IActionResult> Details(int? id)
{
if (id == null)
@@ -58,7 +58,7 @@ namespace WebApp.Controllers
// For more details, see http://go.microsoft.com/fwlink/?LinkId=317598.
[HttpPost]
[ValidateAntiForgeryToken]
[Authorize(Roles = "Admin")]
public async Task<IActionResult> Create([Bind("Id, Brand, Model, Year, CountPassengerSeats, Description, PriceForDay")] Car car)
{
if (ModelState.IsValid)
@@ -147,6 +147,7 @@ namespace WebApp.Controllers
// POST: Cars/Delete/5
[HttpPost, ActionName("Delete")]
[ValidateAntiForgeryToken]
[Authorize(Roles = "Admin")]
public async Task<IActionResult> DeleteConfirmed(int id)
{
var car = await _context.Cars.FindAsync(id);

19
RentACar/WebApp/Controllers/RentsController.cs
View File

@@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.EntityFrameworkCore;
using Data;
using Data.Entities;
using Microsoft.AspNetCore.Authorization;
namespace WebApp.Controllers
{
@@ -20,12 +21,14 @@ namespace WebApp.Controllers
}
// GET: Rents
[Authorize(Roles = "Admin")]
public async Task<IActionResult> Index()
{
return View(await _context.Rents.ToListAsync());
}
// GET: Rents/Details/5
[Authorize]
public async Task<IActionResult> Details(int? id)
{
if (id == null)
@@ -42,13 +45,9 @@ namespace WebApp.Controllers
return View(rents);
}
public IActionResult DateSelect(DateTime startDate, DateTime endDate)
{
return RedirectToAction(nameof(Index));
}
// GET: Rents/Create
[Authorize]
public IActionResult Create(int id)
{
return View();
@@ -59,13 +58,15 @@ namespace WebApp.Controllers
// For more details, see http://go.microsoft.com/fwlink/?LinkId=317598.
[HttpPost]
[ValidateAntiForgeryToken]
public async Task<IActionResult> Create([Bind("Id,Car.Id,StartDate,EndDate,UserId")] Rents rents)
[Authorize]
public async Task<IActionResult> Create([Bind("Id,Car.Id,StartDate,EndDate,User.Id")] Rents rents)
{
if (ModelState.IsValid)
{
var car = _context.Cars.FirstOrDefault(car => car.Id == rents.Car.Id);
rents.Car = car;
var user = _context.Users.FirstOrDefault(user => user.Id == rents.User.Id);
rents.User = user;
_context.Add(rents);
await _context.SaveChangesAsync();
return RedirectToAction(nameof(Index));
@@ -74,6 +75,7 @@ namespace WebApp.Controllers
}
// GET: Rents/Edit/5
[Authorize(Roles = "Admin")]
public async Task<IActionResult> Edit(int? id)
{
if (id == null)
@@ -94,6 +96,7 @@ namespace WebApp.Controllers
// For more details, see http://go.microsoft.com/fwlink/?LinkId=317598.
[HttpPost]
[ValidateAntiForgeryToken]
[Authorize(Roles = "Admin")]
public async Task<IActionResult> Edit(int id, [Bind("Id,CarId,StartDate,EndDate,UserId")] Rents rents)
{
if (id != rents.Id)
@@ -125,6 +128,7 @@ namespace WebApp.Controllers
}
// GET: Rents/Delete/5
[Authorize(Roles = "Admin")]
public async Task<IActionResult> Delete(int? id)
{
if (id == null)
@@ -145,6 +149,7 @@ namespace WebApp.Controllers
// POST: Rents/Delete/5
[HttpPost, ActionName("Delete")]
[ValidateAntiForgeryToken]
[Authorize(Roles = "Admin")]
public async Task<IActionResult> DeleteConfirmed(int id)
{
var rents = await _context.Rents.FindAsync(id);

195
RentACar/WebApp/Controllers/UsersController.cs Normal file
View File

@@ -0,0 +1,195 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.EntityFrameworkCore;
using Data;
using Data.Entities;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Identity;
namespace WebApp.Controllers
{
public class UserWithRoles
{
public string UserName { get; set; }
public string FirstName { get; set; }
public string LastName { get; set; }
public string Email { get; set; }
public string PersonalNumber { get; set; }
public string PhoneNumber { get; set; }
public string Role { get; set; }
}
public class UsersController : Controller
{
private readonly RentACarDbContext _context;
public UsersController(RentACarDbContext context)
{
_context = context;
}
// GET: Users
[Authorize(Roles = "Admin")]
public async Task<IActionResult> Index()
{
ICollection<User> users = await _context.Users.ToListAsync();
ICollection<UserWithRoles> usersWithRole = new List<UserWithRoles>();
//foreach (var item in users)
//{
// var userRole = await _context.UserRoles.FirstOrDefaultAsync(userRoles => userRoles.UserId == item.Id);
// var role = await _context.Roles.FirstOrDefaultAsync(role => role.Id == userRole.RoleId);
// usersWithRole.Add(
// new UserWithRoles()
// {
// UserName = item.UserName,
// FirstName = item.FirstName,
// LastName = item.LastName,
// Email = item.Email,
// PersonalNumber = item.PersonalNumber,
// PhoneNumber = item.PhoneNumber,
// Role = role.Name
// }
// );
//}
return View(users);
}
// GET: Users/Edit/5
[Authorize(Roles = "Admin")]
public async Task<IActionResult> Edit(string id)
{
if (id == null)
{
return NotFound();
}
var user = await _context.Users.FindAsync(id);
if (user == null)
{
return NotFound();
}
return View(user);
}
// GET: Rents/Create
[Authorize(Roles = "Admin")]
public IActionResult Create(int id)
{
return View();
}
// POST: Rents/Create
// To protect from overposting attacks, enable the specific properties you want to bind to.
// For more details, see http://go.microsoft.com/fwlink/?LinkId=317598.
[HttpPost]
[ValidateAntiForgeryToken]
[Authorize(Roles = "Admin")]
public async Task<IActionResult> Create([Bind("FirstName,LastName,PersonalNumber,Id,UserName,NormalizedUserName,Email,NormalizedEmail,EmailConfirmed,PasswordHash,SecurityStamp,ConcurrencyStamp,PhoneNumber,PhoneNumberConfirmed,TwoFactorEnabled,LockoutEnd,LockoutEnabled,AccessFailedCount")] User user)
{
user.Id = Guid.NewGuid().ToString();
PasswordHasher<string> passwordHasher = new PasswordHasher<string>();
user.PasswordHash = passwordHasher.HashPassword(user.Id, user.PasswordHash);
if (ModelState.IsValid)
{
_context.Add(user);
await _context.SaveChangesAsync();
return RedirectToAction(nameof(Index));
}
return View(user);
}
// POST: Users/Edit/5
// To protect from overposting attacks, enable the specific properties you want to bind to.
// For more details, see http://go.microsoft.com/fwlink/?LinkId=317598.
[HttpPost]
[ValidateAntiForgeryToken]
[Authorize(Roles = "Admin")]
public async Task<IActionResult> Edit(string id, [Bind("FirstName,LastName,PersonalNumber,Id,UserName,NormalizedUserName,Email,NormalizedEmail,EmailConfirmed,PasswordHash,SecurityStamp,ConcurrencyStamp,PhoneNumber,PhoneNumberConfirmed,TwoFactorEnabled,LockoutEnd,LockoutEnabled,AccessFailedCount")] User user)
{
if (id != user.Id)
{
return NotFound();
}
if (ModelState.IsValid)
{
try
{
_context.Update(user);
await _context.SaveChangesAsync();
}
catch (DbUpdateConcurrencyException)
{
if (!UserExists(user.Id))
{
return NotFound();
}
else
{
throw;
}
}
return RedirectToAction(nameof(Index));
}
return View(user);
}
// GET: Users/Delete/5
[Authorize(Roles = "Admin")]
public async Task<IActionResult> Delete(string id)
{
if (id == null)
{
return NotFound();
}
var user = await _context.Users
.FirstOrDefaultAsync(m => m.Id == id);
if (user == null)
{
return NotFound();
}
return View(user);
}
// POST: Users/Delete/5
[HttpPost, ActionName("Delete")]
[ValidateAntiForgeryToken]
[Authorize(Roles = "Admin")]
public async Task<IActionResult> DeleteConfirmed(string id)
{
var user = await _context.Users.FindAsync(id);
_context.Users.Remove(user);
await _context.SaveChangesAsync();
return RedirectToAction(nameof(Index));
}
// GET: Users/Details/5
[Authorize(Roles = "Admin")]
public async Task<IActionResult> Details(string? id)
{
if (id == null)
{
return NotFound();
}
var user = await _context.Users
.FirstOrDefaultAsync(m => m.Id == id);
if (user == null)
{
return NotFound();
}
return View(user);
}
private bool UserExists(string id)
{
return _context.Users.Any(e => e.Id == id);
}
}
}