diff --git a/Readme.md b/Readme.md new file mode 100644 index 0000000..1a7fa38 --- /dev/null +++ b/Readme.md @@ -0,0 +1,23 @@ +## auto.bus (Ticket Office) – пошук та купівля квитків на автобус онлайн + +- C#, Microsoft.EntityFrameworkCore, Razor Pages + +### Встановлення: + +1. Скомпілювати проєкт +2. Скопіювати каталог ~/Ticket\ Office/wwwroot/ у кореневий каталог скомпільованого проєкту +3. Запустити скомпільований проєкт + +* ~ – кореневий каталог вихідного коду проєкту + +### Доступні маршрути: + +#### № 027 + +- Сватове -> Красноріченське -> Кремінна -> Рубіжне -> Сєвєродонецьк -> Лисичанськ -> Сєвєродонецьк -> Рубіжне -> Кремінна -> Красноріченське -> Сватове +- (Дата: дата встановлення проєкту) + +#### № 013 + +- Кремінна -> Рубіжне -> Сєвєродонецьк -> Станиця Луганська -> Сєвєродонецьк -> Рубіжне -> Кремінна +- (Дата: дата встановлення проєкту) diff --git a/TicketOffice/Data/TicketOfficeContext.cs b/TicketOffice/Data/TicketOfficeContext.cs index f4554dc..b02dd52 100644 --- a/TicketOffice/Data/TicketOfficeContext.cs +++ b/TicketOffice/Data/TicketOfficeContext.cs @@ -1,10 +1,5 @@ #nullable disable -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; -using TicketOffice.Models; namespace TicketOffice.Data { @@ -15,13 +10,13 @@ namespace TicketOffice.Data { } - public DbSet User { get; set; } + public DbSet User { get; set; } - public DbSet Route { get; set; } + public DbSet Route { get; set; } - public DbSet RouteCity { get; set; } - public DbSet TicketCity { get; set; } + public DbSet RouteCity { get; set; } + public DbSet TicketCity { get; set; } - public DbSet Ticket { get; set; } + public DbSet Ticket { get; set; } } } diff --git a/TicketOffice/Migrations/20220526065734_Initial_Create.Designer.cs b/TicketOffice/Migrations/20220529081528_Initial_Create.Designer.cs similarity index 91% rename from TicketOffice/Migrations/20220526065734_Initial_Create.Designer.cs rename to TicketOffice/Migrations/20220529081528_Initial_Create.Designer.cs index 8983d3b..38e595b 100644 --- a/TicketOffice/Migrations/20220526065734_Initial_Create.Designer.cs +++ b/TicketOffice/Migrations/20220529081528_Initial_Create.Designer.cs @@ -11,7 +11,7 @@ using TicketOffice.Data; namespace TicketOffice.Migrations { [DbContext(typeof(TicketOfficeContext))] - [Migration("20220526065734_Initial_Create")] + [Migration("20220529081528_Initial_Create")] partial class Initial_Create { protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -133,26 +133,11 @@ namespace TicketOffice.Migrations .HasMaxLength(48) .HasColumnType("TEXT"); - b.Property("FirstName") - .HasMaxLength(24) - .HasColumnType("TEXT"); - - b.Property("IsManager") - .HasColumnType("INTEGER"); - - b.Property("LastName") - .HasMaxLength(24) - .HasColumnType("TEXT"); - b.Property("Password") .IsRequired() .HasMaxLength(32) .HasColumnType("TEXT"); - b.Property("Patronymic") - .HasMaxLength(24) - .HasColumnType("TEXT"); - b.HasKey("Id"); b.ToTable("User"); diff --git a/TicketOffice/Migrations/20220526065734_Initial_Create.cs b/TicketOffice/Migrations/20220529081528_Initial_Create.cs similarity index 93% rename from TicketOffice/Migrations/20220526065734_Initial_Create.cs rename to TicketOffice/Migrations/20220529081528_Initial_Create.cs index 5ed937a..dc791e6 100644 --- a/TicketOffice/Migrations/20220526065734_Initial_Create.cs +++ b/TicketOffice/Migrations/20220529081528_Initial_Create.cs @@ -29,12 +29,8 @@ namespace TicketOffice.Migrations { Id = table.Column(type: "INTEGER", nullable: false) .Annotation("Sqlite:Autoincrement", true), - FirstName = table.Column(type: "TEXT", maxLength: 24, nullable: true), - LastName = table.Column(type: "TEXT", maxLength: 24, nullable: true), - Patronymic = table.Column(type: "TEXT", maxLength: 24, nullable: true), Email = table.Column(type: "TEXT", maxLength: 48, nullable: false), - Password = table.Column(type: "TEXT", maxLength: 32, nullable: false), - IsManager = table.Column(type: "INTEGER", nullable: false) + Password = table.Column(type: "TEXT", maxLength: 32, nullable: false) }, constraints: table => { diff --git a/TicketOffice/Migrations/TicketOfficeContextModelSnapshot.cs b/TicketOffice/Migrations/TicketOfficeContextModelSnapshot.cs index ac4e9a7..f70548a 100644 --- a/TicketOffice/Migrations/TicketOfficeContextModelSnapshot.cs +++ b/TicketOffice/Migrations/TicketOfficeContextModelSnapshot.cs @@ -131,26 +131,11 @@ namespace TicketOffice.Migrations .HasMaxLength(48) .HasColumnType("TEXT"); - b.Property("FirstName") - .HasMaxLength(24) - .HasColumnType("TEXT"); - - b.Property("IsManager") - .HasColumnType("INTEGER"); - - b.Property("LastName") - .HasMaxLength(24) - .HasColumnType("TEXT"); - b.Property("Password") .IsRequired() .HasMaxLength(32) .HasColumnType("TEXT"); - b.Property("Patronymic") - .HasMaxLength(24) - .HasColumnType("TEXT"); - b.HasKey("Id"); b.ToTable("User"); diff --git a/TicketOffice/Models/Route.cs b/TicketOffice/Models/Route.cs index a017041..24147bd 100644 --- a/TicketOffice/Models/Route.cs +++ b/TicketOffice/Models/Route.cs @@ -1,7 +1,4 @@ using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.AspNetCore.Components; -using Microsoft.EntityFrameworkCore; namespace TicketOffice.Models; @@ -21,7 +18,7 @@ public class Route public int Capacity { get; set; } [Required] - public ICollection Cities { get; set; } - + public ICollection Cities { get; set; } = null!; + public ICollection? Tickets { get; set; } } \ No newline at end of file diff --git a/TicketOffice/Models/RouteCity.cs b/TicketOffice/Models/RouteCity.cs index 5152f2b..fa36312 100644 --- a/TicketOffice/Models/RouteCity.cs +++ b/TicketOffice/Models/RouteCity.cs @@ -12,8 +12,8 @@ public class RouteCity MinLength(2, ErrorMessage = "Назва міста не може бути менше 2 символів")] [Display(Name = "Назва міста")] [Required(ErrorMessage = "Поле має бути заповненим")] - public string Name { get; set; } - + public string Name { get; set; } = null!; + [Display(Name = "Дата відправлення")] [DataType(DataType.Date)] public DateTime? ArrivalTime { get; set; } @@ -24,5 +24,5 @@ public class RouteCity [ForeignKey("Route")] public int RouteId { get; set; } - public Route Route { get; set; } + public Route Route { get; set; } = null!; } \ No newline at end of file diff --git a/TicketOffice/Models/SeedData.cs b/TicketOffice/Models/SeedData.cs index 6d35456..2364cb8 100644 --- a/TicketOffice/Models/SeedData.cs +++ b/TicketOffice/Models/SeedData.cs @@ -13,12 +13,13 @@ public class SeedData if (context == null) { - throw new ArgumentNullException("Null TicketOfficeContext"); + throw new ArgumentNullException(nameof(serviceProvider)); } - if (context.User.Any() | context.Route.Any() | context.RouteCity.Any() | context.Ticket.Any()) + if (context.User.Any() | context.Route.Any() | + context.RouteCity.Any() | context.Ticket.Any()) // Data has been seeded { - return; // Data has been seeded + return; } context.Database.EnsureCreated(); @@ -29,95 +30,360 @@ public class SeedData { Email = "danylo.nazarko@nure.ua", Password = "*Hashed Password*", - IsManager = false, - }, - new User - { - Email = "ruslan.shanin@nure.ua", - Password = "*Hashed Password*", - IsManager = false } }); context.Route.AddRange(new Route[] { - new Route { - Number = 2, + new Route() + { + Number = 027, Capacity = 30, - Cities = new RouteCity[] + Cities = new List() { + new RouteCity + { + Name = "Сватове", + + ArrivalTime = null, + + DepartureTime = new DateTime( + DateTime.Today.Year, + DateTime.Today.Month, + DateTime.Today.Day, + 6, + 30, + 0) + }, + new RouteCity + { + Name = "Красноріченське", + + ArrivalTime = new DateTime( + DateTime.Today.Year, + DateTime.Today.Month, + DateTime.Today.Day, + 7, + 10, + 0), + + DepartureTime = new DateTime( + DateTime.Today.Year, + DateTime.Today.Month, + DateTime.Today.Day, + 7, + 20, + 0) + }, new RouteCity { Name = "Кремінна", - ArrivalTime = new DateTime(2022, 03, 28, 8, 15, 0), - DepartureTime = new DateTime(2022, 03, 28, 8, 35, 0), + + ArrivalTime = new DateTime( + DateTime.Today.Year, + DateTime.Today.Month, + DateTime.Today.Day, + 7, + 50, + 0), + + DepartureTime = new DateTime( + DateTime.Today.Year, + DateTime.Today.Month, + DateTime.Today.Day, + 8, + 0, + 0) }, new RouteCity { Name = "Рубіжне", - ArrivalTime = new DateTime(2022, 03, 28, 9, 5, 0), - DepartureTime = new DateTime(2022, 03, 28, 9, 25, 0), + + ArrivalTime = new DateTime( + DateTime.Today.Year, + DateTime.Today.Month, + DateTime.Today.Day, + 8, + 30, + 0), + + DepartureTime = new DateTime( + DateTime.Today.Year, + DateTime.Today.Month, + DateTime.Today.Day, + 8, + 40, + 0) }, new RouteCity { Name = "Сєвєродонецьк", - ArrivalTime = new DateTime(2022, 03, 28, 9, 55, 0) + + ArrivalTime = new DateTime( + DateTime.Today.Year, + DateTime.Today.Month, + DateTime.Today.Day, + 9, + 10, + 0), + + DepartureTime = new DateTime( + DateTime.Today.Year, + DateTime.Today.Month, + DateTime.Today.Day, + 9, + 20, + 0) + }, + new RouteCity + { + Name = "Лисичанськ", + + ArrivalTime = new DateTime( + DateTime.Today.Year, + DateTime.Today.Month, + DateTime.Today.Day, + 9, + 50, + 0), + + DepartureTime = new DateTime( + DateTime.Today.Year, + DateTime.Today.Month, + DateTime.Today.Day, + 12, + 0, + 0), + }, + new RouteCity + { + Name = "Сєвєродонецьк", + + ArrivalTime = new DateTime( + DateTime.Today.Year, + DateTime.Today.Month, + DateTime.Today.Day, + 12, + 30, + 0), + + DepartureTime = new DateTime( + DateTime.Today.Year, + DateTime.Today.Month, + DateTime.Today.Day, + 12, + 40, + 0) + }, + new RouteCity + { + Name = "Рубіжне", + + ArrivalTime = new DateTime( + DateTime.Today.Year, + DateTime.Today.Month, + DateTime.Today.Day, + 13, + 10, + 0), + + DepartureTime = new DateTime( + DateTime.Today.Year, + DateTime.Today.Month, + DateTime.Today.Day, + 13, + 20, + 0) + }, + new RouteCity + { + Name = "Кремінна", + + ArrivalTime = new DateTime( + DateTime.Today.Year, + DateTime.Today.Month, + DateTime.Today.Day, + 13, + 50, + 0), + + DepartureTime = new DateTime( + DateTime.Today.Year, + DateTime.Today.Month, + DateTime.Today.Day, + 14, + 0, + 0) + }, + new RouteCity + { + Name = "Красноріченське", + + ArrivalTime = new DateTime( + DateTime.Today.Year, + DateTime.Today.Month, + DateTime.Today.Day, + 14, + 30, + 0), + + DepartureTime = new DateTime( + DateTime.Today.Year, + DateTime.Today.Month, + DateTime.Today.Day, + 14, + 40, + 0) + }, + new RouteCity + { + Name = "Сватове", + + ArrivalTime = new DateTime( + DateTime.Today.Year, + DateTime.Today.Month, + DateTime.Today.Day, + 15, + 20, + 0), + + DepartureTime = null } } }, - new Route + new Route() { - Number = 1, + Number = 013, Capacity = 25, - Cities = new RouteCity[] - { - new RouteCity - { - Name = "Сєвєродонецьк", - ArrivalTime = new DateTime(2022, 03, 28, 15, 55, 0), - DepartureTime = new DateTime(2022, 03, 28, 16, 15, 0), - }, - new RouteCity - { - Name = "Рубіжне", - ArrivalTime = new DateTime(2022, 03, 28, 16, 45, 0), - DepartureTime = new DateTime(2022, 03, 28, 17, 5, 0), - }, - new RouteCity - { - Name = "Кремінна", - ArrivalTime = new DateTime(2022, 03, 28, 17, 40, 0) - } - } - }, - new Route - { - Number = 3, - Capacity = 30, - Cities = new RouteCity[] + Cities = new List() { new RouteCity { Name = "Кремінна", - ArrivalTime = new DateTime(2022, 03, 28, 9, 20, 0), - DepartureTime = new DateTime(2022, 03, 28, 8, 40, 0), - }, - new RouteCity - { - Name = "Житлівка", - ArrivalTime = new DateTime(2022, 03, 28, 10, 0, 0), - DepartureTime = new DateTime(2022, 03, 28, 10, 15, 0), + + ArrivalTime = null, + + DepartureTime = new DateTime( + DateTime.Today.Year, + DateTime.Today.Month, + DateTime.Today.Day, + 7, + 0, + 0) }, new RouteCity { Name = "Рубіжне", - ArrivalTime = new DateTime(2022, 03, 28, 11, 5, 0), - DepartureTime = new DateTime(2022, 03, 28, 11, 20, 0), + + ArrivalTime = new DateTime( + DateTime.Today.Year, + DateTime.Today.Month, + DateTime.Today.Day, + 7, + 30, + 0), + + DepartureTime = new DateTime( + DateTime.Today.Year, + DateTime.Today.Month, + DateTime.Today.Day, + 7, + 40, + 0) }, new RouteCity { Name = "Сєвєродонецьк", - ArrivalTime = new DateTime(2022, 03, 28, 11, 55, 0) + + ArrivalTime = new DateTime( + DateTime.Today.Year, + DateTime.Today.Month, + DateTime.Today.Day, + 8, + 10, + 0), + + DepartureTime = new DateTime( + DateTime.Today.Year, + DateTime.Today.Month, + DateTime.Today.Day, + 8, + 20, + 0) + }, + new RouteCity + { + Name = "Станиця Луганська", + + ArrivalTime = new DateTime( + DateTime.Today.Year, + DateTime.Today.Month, + DateTime.Today.Day, + 9, + 20, + 0), + + DepartureTime = new DateTime( + DateTime.Today.Year, + DateTime.Today.Month, + DateTime.Today.Day, + 11, + 20, + 0) + }, + new RouteCity + { + Name = "Сєвєродонецьк", + + ArrivalTime = new DateTime( + DateTime.Today.Year, + DateTime.Today.Month, + DateTime.Today.Day, + 12, + 20, + 0), + + DepartureTime = new DateTime( + DateTime.Today.Year, + DateTime.Today.Month, + DateTime.Today.Day, + 12, + 30, + 0) + }, + new RouteCity + { + Name = "Рубіжне", + + ArrivalTime = new DateTime( + DateTime.Today.Year, + DateTime.Today.Month, + DateTime.Today.Day, + 13, + 0, + 0), + + DepartureTime = new DateTime( + DateTime.Today.Year, + DateTime.Today.Month, + DateTime.Today.Day, + 13, + 10, + 0) + }, + new RouteCity + { + Name = "Кремінна", + + ArrivalTime = new DateTime( + DateTime.Today.Year, + DateTime.Today.Month, + DateTime.Today.Day, + 13, + 40, + 0), + + DepartureTime = null } } } diff --git a/TicketOffice/Models/Ticket.cs b/TicketOffice/Models/Ticket.cs index 419ad26..946cb69 100644 --- a/TicketOffice/Models/Ticket.cs +++ b/TicketOffice/Models/Ticket.cs @@ -10,24 +10,24 @@ public class Ticket [Required(ErrorMessage = "Поле має бути заповненим")] [Display(Name = "Ім'я пасажира")] - public string PassengerFirstName { get; set; } - + public string PassengerFirstName { get; set; } = null!; + [Required(ErrorMessage = "Поле має бути заповненим")] [Display(Name = "Прізвище пасажира")] - public string PassengerLastName { get; set; } - + public string PassengerLastName { get; set; } = null!; + [Required(ErrorMessage = "Поле має бути заповненим")] [Display(Name = "Номер місця пасажира")] public int PassengerPlace { get; set; } [Required] - public ICollection Cities { get; set; } + public ICollection Cities { get; set; } = null!; [ForeignKey("User")] public int UserId { get; set; } - public User User { get; set; } - + public User User { get; set; } = null!; + [ForeignKey("Route")] public int RouteId { get; set; } - public Route Route { get; set; } + public Route Route { get; set; } = null!; } \ No newline at end of file diff --git a/TicketOffice/Models/TicketCity.cs b/TicketOffice/Models/TicketCity.cs index 548b280..4b5b4a8 100644 --- a/TicketOffice/Models/TicketCity.cs +++ b/TicketOffice/Models/TicketCity.cs @@ -12,8 +12,8 @@ public class TicketCity MinLength(2, ErrorMessage = "Назва міста не може бути менше 2 символів")] [Display(Name = "Назва міста")] [Required(ErrorMessage = "Поле має бути заповненим")] - public string Name { get; set; } - + public string Name { get; set; } = null!; + [Display(Name = "Дата відправлення")] [DataType(DataType.Date)] public DateTime? ArrivalTime { get; set; } @@ -24,5 +24,5 @@ public class TicketCity [ForeignKey("Ticket")] public int TicketId { get; set; } - public Ticket Ticket { get; set; } + public Ticket Ticket { get; set; } = null!; } \ No newline at end of file diff --git a/TicketOffice/Models/User.cs b/TicketOffice/Models/User.cs index 27e55c7..672db96 100644 --- a/TicketOffice/Models/User.cs +++ b/TicketOffice/Models/User.cs @@ -1,5 +1,4 @@ using System.ComponentModel.DataAnnotations; -using System.Net.Mail; namespace TicketOffice.Models; @@ -7,23 +6,7 @@ public class User { [Key] public int Id { get; set; } - - [MaxLength(24, ErrorMessage = "Ім'я не може бути більше 24 символів"), - MinLength(4, ErrorMessage = "Ім'я не може бути менше 4 символів")] - [Display(Name = "Ім'я")] - public string? FirstName { get; set; } - - [MaxLength(24, ErrorMessage = "Прізвище не може бути більше 24 символів"), - MinLength(4, ErrorMessage = "Прізвище не може бути менше 4 символів")] - [Display(Name = "Прізвище")] - public string? LastName { get; set; } - - [MaxLength(24, ErrorMessage = "Ім'я по батькові не може бути більше 24 символів"), - MinLength(4, ErrorMessage = "Ім'я по батькові не може бути менше 4 символів")] - [Display(Name = "По батькові")] - public string? Patronymic { get; set; } - - + [MaxLength(48, ErrorMessage = "E-mail не може бути більше 48 символів"), MinLength(6, ErrorMessage = "E-mail не може бути менше 6 символів")] [Required(ErrorMessage = "Поле має бути заповненим")] @@ -31,8 +14,8 @@ public class User [DataType(DataType.EmailAddress)] [RegularExpression(@"^[^@\s]+@[^@\s]+\.[^@\s]+$", ErrorMessage = "E-mail невалідний")] - public string Email { get; set; } - + public string Email { get; set; } = null!; + [MaxLength(32, ErrorMessage = "Пароль має бути менше 32 символів"), MinLength(8, ErrorMessage = "Пороль має бути більше 8 символів")] [Required(ErrorMessage = "Поле має бути заповненим")] @@ -40,11 +23,8 @@ public class User [DataType(DataType.Password)] [RegularExpression(@"^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{8,}$", ErrorMessage = "Проль має містити великі та малі латинські літери, цифри та спеціальні знаки (@, $, % та ін.)")] - public string Password { get; set; } + public string Password { get; set; } = null!; + - public ICollection? Tickets { get; set; } - - [Required] - public bool IsManager { get; set; } } \ No newline at end of file diff --git a/TicketOffice/Pages/Auth/Account.cshtml b/TicketOffice/Pages/Auth/Account.cshtml index cec9bae..7d62cfa 100644 --- a/TicketOffice/Pages/Auth/Account.cshtml +++ b/TicketOffice/Pages/Auth/Account.cshtml @@ -1,6 +1,6 @@ @page @using System.Globalization -@model TicketOffice.Pages.Account.IndexModel +@model TicketOffice.Pages.Auth.AccountModel @{ Layout = "~/Pages/Shared/_Layout.cshtml"; ViewData["Title"] = "Аккаунт"; @@ -62,14 +62,6 @@ } -@*
*@ -@* *@ -@*
*@ -@*
Керування аккаунтом
*@ -@*
*@ - -@* Popup windows *@ - @if (Model.Tickets is not {Count: 0}) { foreach (var ticket in Model.Tickets) diff --git a/TicketOffice/Pages/Auth/Account.cshtml.cs b/TicketOffice/Pages/Auth/Account.cshtml.cs index 863d430..bb5fe3d 100644 --- a/TicketOffice/Pages/Auth/Account.cshtml.cs +++ b/TicketOffice/Pages/Auth/Account.cshtml.cs @@ -4,27 +4,34 @@ using Microsoft.EntityFrameworkCore; using TicketOffice.Data; using TicketOffice.Models; -namespace TicketOffice.Pages.Account; +namespace TicketOffice.Pages.Auth; -public class IndexModel : PageModel +public class AccountModel : PageModel { - public List Tickets { get; set; } - [BindProperty(SupportsGet = true)] public int ReturnTicketId { get; set; } + private readonly TicketOfficeContext context; - private readonly TicketOfficeContext _context; - - public IndexModel(TicketOfficeContext context, ILogger logger) + public AccountModel(TicketOfficeContext context) { - _context = context; + this.context = context; } + // User's tickets. + public List Tickets { get; set; } = null!; + + // Will be set when user confirm ticket return. + [BindProperty(SupportsGet = true)] + public int ReturnTicketId { get; set; } + + // Called when GET request is sent to the page. Checks if the session is + // valid then retrieves all user's tickets. public ActionResult OnGet() { if (!ValidateSession()) return RedirectToPage("/Auth/Login"); - Tickets = _context.Ticket - .Where(t => t.UserId == HttpContext.Session.GetInt32("UserId")) + Tickets = context.Ticket + .Where(t => + t.UserId == HttpContext.Session.GetInt32("UserId")) .Include(t => t.Route) .Include(t => t.Cities) .ToList(); @@ -32,21 +39,25 @@ public class IndexModel : PageModel return Page(); } + // Called when user confirms ticket return. public ActionResult OnGetReturnTicket() { OnGet(); - Ticket returnTicket = _context.Ticket.Find(ReturnTicketId); + Ticket? returnTicket = context.Ticket.Find(ReturnTicketId); - if (returnTicket is not null) + if (returnTicket != null) { - _context.Remove(returnTicket); - _context.SaveChanges(); + context.Remove(returnTicket); + context.SaveChanges(); return RedirectToPage("./Account"); } return NotFound(); } - - private bool ValidateSession() => HttpContext.Session.GetInt32("UserId") is not null; + + private bool ValidateSession() + { + return HttpContext.Session.GetInt32("UserId") != null; + } } \ No newline at end of file diff --git a/TicketOffice/Pages/Auth/Index.cshtml.cs b/TicketOffice/Pages/Auth/Index.cshtml.cs index 57ab1b5..2eed9bd 100644 --- a/TicketOffice/Pages/Auth/Index.cshtml.cs +++ b/TicketOffice/Pages/Auth/Index.cshtml.cs @@ -5,5 +5,15 @@ namespace TicketOffice.Pages.Auth; public class IndexModel : PageModel { - public ActionResult OnGet() => HttpContext.Session.GetInt32("UserId") is not null ? RedirectToPage("/Auth/Account") : RedirectToPage("/Auth/Login"); + // Called when GET request is sent to the page. Determines what page + // user will be redirected to depending on his/her authorization status. + public ActionResult OnGet() + { + if (HttpContext.Session.GetInt32("UserId") != null) + { + return RedirectToPage("/Auth/Account"); + } + + return RedirectToPage("/Auth/Login"); + } } \ No newline at end of file diff --git a/TicketOffice/Pages/Auth/Login.cshtml b/TicketOffice/Pages/Auth/Login.cshtml index e8919c5..8101882 100644 --- a/TicketOffice/Pages/Auth/Login.cshtml +++ b/TicketOffice/Pages/Auth/Login.cshtml @@ -14,13 +14,13 @@ Авторизація - +
@Model.EmailValidationError

- +
@Model.PasswordValidationError
diff --git a/TicketOffice/Pages/Auth/Login.cshtml.cs b/TicketOffice/Pages/Auth/Login.cshtml.cs index 8ca1a21..c921ec6 100644 --- a/TicketOffice/Pages/Auth/Login.cshtml.cs +++ b/TicketOffice/Pages/Auth/Login.cshtml.cs @@ -1,7 +1,6 @@ using System.Text.RegularExpressions; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; -using Microsoft.EntityFrameworkCore; using TicketOffice.Data; using TicketOffice.Models; @@ -9,28 +8,45 @@ namespace TicketOffice.Pages.Auth; public class LoginModel : PageModel { - [BindProperty] public User? User { get; set; } + // Error massage displaying when email validation failed. + public string EmailValidationError = null!; - public string EmailValidationError; - public string PasswordValidationError; + // Error massage displaying when password validation failed. + public string PasswordValidationError = null!; - private readonly TicketOfficeContext _context; + private readonly TicketOfficeContext context; public LoginModel(TicketOfficeContext context) { - _context = context; + this.context = context; + } + + // Object representing a user who wants to login. + [BindProperty] + public new User? User { get; set; } + + // Called when GET request is sent to the page. Validates the session and + // redirects to "Account" page if user already logged in. + public ActionResult OnGet() + { + if (ValidateSession()) + { + return RedirectToPage("/Auth/Account"); + } + + return Page(); } - public ActionResult OnGet() => ValidateSession() ? RedirectToPage("/Auth/Account") : Page(); - + // Called when POST request is sent to the page. Validates login form and + // redirects to "Account" page if the validation succeed. public ActionResult OnPost() { if (ValidateForm()) { - User user = _context.User.FirstOrDefault(u => u.Email == User.Email); + User? user = context.User + .FirstOrDefault(u => u.Email == User!.Email); - HttpContext.Session.SetInt32("UserId", user.Id); - HttpContext.Session.SetInt32("IsManager", user.IsManager ? 1 : 0); + HttpContext.Session.SetInt32("UserId", user!.Id); return RedirectToPage("/Auth/Account"); } @@ -39,13 +55,14 @@ public class LoginModel : PageModel private bool ValidateForm() { - User? user = _context.User.FirstOrDefault(u => u.Email == User.Email); + User? user = context.User.FirstOrDefault(u => u.Email == User!.Email); - return ValidateEmail(User.Email, out EmailValidationError) && ValidatePassword(User.Password, out PasswordValidationError); + return ValidateEmail(User!.Email, out EmailValidationError) && + ValidatePassword(User.Password, out PasswordValidationError); bool ValidateEmail(string email, out string validationError) { - if (user is not null) + if (user != null) { validationError = String.Empty; return true; @@ -71,7 +88,7 @@ public class LoginModel : PageModel bool ValidatePassword(string password, out string validationError) { - if (user.Password == password) + if (user!.Password == password) { validationError = String.Empty; return true; @@ -87,6 +104,9 @@ public class LoginModel : PageModel return false; } } - - private bool ValidateSession() => HttpContext.Session.GetInt32("UserId") is not null; + + private bool ValidateSession() + { + return HttpContext.Session.GetInt32("UserId") != null; + } } \ No newline at end of file diff --git a/TicketOffice/Pages/Auth/Registration.cshtml.cs b/TicketOffice/Pages/Auth/Registration.cshtml.cs index 0947e0b..5b683cb 100644 --- a/TicketOffice/Pages/Auth/Registration.cshtml.cs +++ b/TicketOffice/Pages/Auth/Registration.cshtml.cs @@ -1,7 +1,6 @@ using System.Text.RegularExpressions; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; -using Microsoft.EntityFrameworkCore; using TicketOffice.Data; using TicketOffice.Models; @@ -9,31 +8,47 @@ namespace TicketOffice.Pages.Auth; public class RegistrationModel : PageModel { - [BindProperty] public User User { get; set; } + // Error massage displaying when email validation failed. + public string EmailValidationError = null!; - public string EmailValidationError; - public string PasswordValidationError; + // Error massage displaying when password validation failed. + public string PasswordValidationError = null!; - private readonly TicketOfficeContext _context; + private readonly TicketOfficeContext context; public RegistrationModel(TicketOfficeContext context) { - _context = context; + this.context = context; + } + + [BindProperty] + public new User User { get; set; } = null!; + + // Called when GET request is sent to the page. Validates the session and + // redirects to "Account" page if user already logged in. + public ActionResult OnGet() + { + if (ValidateSession()) + { + return RedirectToPage("/Auth/Account"); + } + + return Page(); } - public ActionResult OnGet() => ValidateSession() ? RedirectToPage("/Auth/Account") : Page(); - + // Called when POST request is sent to the page. Validates registration form, + // adds new user to the database and redirects to "Account" page if the + // validation succeed. public ActionResult OnPost() { if (ValidateForm()) { - _context.User.Add(User); - _context.SaveChanges(); + context.User.Add(User); + context.SaveChanges(); - User = _context.User.FirstOrDefault(u => u.Email == User.Email); + User = context.User.FirstOrDefault(u => u.Email == User.Email)!; HttpContext.Session.SetInt32("UserId", User.Id); - return RedirectToPage("/Auth/Account"); } @@ -42,7 +57,10 @@ public class RegistrationModel : PageModel private bool ValidateForm() { - return ValidateEmail(User.Email, out EmailValidationError) && ValidatePassword(User.Password, out PasswordValidationError); + return ValidateEmail(User.Email, out EmailValidationError) && + ValidatePassword(User.Password, + out PasswordValidationError); + bool ValidateEmail(string email, out string validationError) { @@ -60,9 +78,10 @@ public class RegistrationModel : PageModel return false; } - User user = _context.User.FirstOrDefault(u => u.Email == User.Email); + User? user = context.User + .FirstOrDefault(u => u.Email == User.Email); - if (user is not null) + if (user != null) { validationError = "E-mail уже зареєстровано"; return false; @@ -86,11 +105,14 @@ public class RegistrationModel : PageModel return false; } - Regex passwordRegex = new Regex(@"^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{8,}$"); + Regex passwordRegex = + new Regex(@"^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{8,}$"); if (!passwordRegex.IsMatch(passowrd)) { - validationError = "Пароль має містити великі та малі латинські літери, цифри та спеціальні знаки (@, $, % та ін.)"; + validationError = "Пароль має містити " + + "великі та малі латинські літери, " + + "цифри та спеціальні знаки (@, $, % та ін.)"; return false; } @@ -99,5 +121,8 @@ public class RegistrationModel : PageModel } } - bool ValidateSession() => HttpContext.Session.GetInt32("UserId") is not null; + private bool ValidateSession() + { + return HttpContext.Session.GetInt32("UserId") != null; + } } \ No newline at end of file diff --git a/TicketOffice/Pages/Error.cshtml.cs b/TicketOffice/Pages/Error.cshtml.cs index 6c7cf07..fa149e5 100644 --- a/TicketOffice/Pages/Error.cshtml.cs +++ b/TicketOffice/Pages/Error.cshtml.cs @@ -8,17 +8,17 @@ namespace TicketOffice.Pages; [IgnoreAntiforgeryToken] public class ErrorModel : PageModel { - public string? RequestId { get; set; } - public bool ShowRequestId => !string.IsNullOrEmpty(RequestId); - private readonly ILogger _logger; + private readonly ILogger logger; public ErrorModel(ILogger logger) { - _logger = logger; + this.logger = logger; } + public string? RequestId { get; set; } + public void OnGet() { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier; diff --git a/TicketOffice/Pages/Routes/Index.cshtml b/TicketOffice/Pages/Routes/Index.cshtml index 439d8f6..b48dbb9 100644 --- a/TicketOffice/Pages/Routes/Index.cshtml +++ b/TicketOffice/Pages/Routes/Index.cshtml @@ -1,6 +1,5 @@ @page @using System.Globalization -@using TicketOffice.Models @model TicketOffice.Pages.Routes.IndexModel @{ Layout = "~/Pages/Shared/_Layout.cshtml"; @@ -35,7 +34,7 @@
Дата відправлення
- +
@@ -53,15 +52,15 @@ № автобуса @if (Model.SortString == "increasingNumber") { - 🠕 + 🠕 } else if (Model.SortString == "descendingNumber") { - 🠗 + 🠗 } else { - ⮁ + ⮁ } @@ -75,30 +74,30 @@ Відправлення @if (Model.SortString == "increasingDeparture") { - 🠕 + 🠕 } else if (Model.SortString == "descendingDeparture") { - 🠗 + 🠗 } else { - ⮁ + ⮁ }
Прибуття @if (Model.SortString == "increasingArrival") { - 🠕 + 🠕 } else if (Model.SortString == "descendingArrival") { - 🠗 + 🠗 } else { - ⮁ + ⮁ }
@@ -106,15 +105,15 @@ Тривалість @if (Model.SortString == "increasingDuration") { - 🠕 + 🠕 } else if (Model.SortString == "descendingDuration") { - 🠗 + 🠗 } else { - ⮁ + ⮁ } @@ -143,7 +142,7 @@ Відправлення - @route.Cities.First().ArrivalTime?.ToString("f").Split(",")[0].ToLower(), + @route.Cities.First().DepartureTime?.ToString("f").Split(",")[0].ToLower(), @route.Cities.First().DepartureTime?.ToString("dd.MM.yyyy") @@ -156,12 +155,13 @@ -
@route.Cities.First().DepartureTime?.ToString("HH:mm")
-
@route.Cities.Last().ArrivalTime?.ToString("HH:mm")
+
@route.Cities.First().DepartureTime?.ToString("t")
+
@route.Cities.Last().ArrivalTime?.ToString("t")
@{ TimeSpan? duration = route.Cities.Last().ArrivalTime - route.Cities.First().DepartureTime; } - @($"{duration?.TotalHours.ToString().Split(",")[0]}:{duration?.Minutes}") + + @($"{duration?.TotalHours.ToString(CultureInfo.CurrentCulture).Split(",")[0]}:{duration?.Minutes:00}") @Model.GetRemainingCapacity(route) @@ -178,7 +178,7 @@ else if (Model.Routes == null) {
-

Уведіть дату й місто відправлення або прибуття

+

Уведіть дату, місто відправлення й прибуття

} else @@ -190,7 +190,7 @@ -@if (Model.Routes is not null) +@if (Model.Routes != null) { foreach (var route in Model.Routes) { @@ -274,7 +274,9 @@ -