From acb4786f483ce29e6cdd2032b7a9a4189574fae6 Mon Sep 17 00:00:00 2001 From: cuqmbr Date: Wed, 11 May 2022 15:12:21 +0300 Subject: [PATCH] refactor: project cleanup before further work --- TicketOffice/Pages/Account/Index.cshtml.cs | 10 -- .../Index.cshtml => Auth/Account.cshtml} | 6 +- TicketOffice/Pages/Auth/Account.cshtml.cs | 12 ++ TicketOffice/Pages/Auth/Index.cshtml | 6 + TicketOffice/Pages/Auth/Index.cshtml.cs | 9 + TicketOffice/Pages/Auth/Login.cshtml | 4 +- TicketOffice/Pages/Auth/Login.cshtml.cs | 117 +++++++------ TicketOffice/Pages/Auth/Registration.cshtml | 4 +- .../Pages/Auth/Registration.cshtml.cs | 156 +++++++++--------- TicketOffice/Pages/Index.cshtml.cs | 14 +- TicketOffice/Pages/Routes/Index.cshtml | 42 ++++- TicketOffice/Pages/Routes/Index.cshtml.cs | 27 +-- TicketOffice/Pages/Shared/_Layout.cshtml | 2 +- TicketOffice/Program.cs | 2 +- TicketOffice/wwwroot/css/Account.css | 57 +++++++ TicketOffice/wwwroot/css/Index.css | 2 +- TicketOffice/wwwroot/css/Layout.css | 4 +- TicketOffice/wwwroot/css/Management.css | 0 TicketOffice/wwwroot/css/Routes.css | 15 +- 19 files changed, 286 insertions(+), 203 deletions(-) delete mode 100644 TicketOffice/Pages/Account/Index.cshtml.cs rename TicketOffice/Pages/{Account/Index.cshtml => Auth/Account.cshtml} (51%) create mode 100644 TicketOffice/Pages/Auth/Account.cshtml.cs create mode 100644 TicketOffice/Pages/Auth/Index.cshtml create mode 100644 TicketOffice/Pages/Auth/Index.cshtml.cs create mode 100644 TicketOffice/wwwroot/css/Account.css create mode 100644 TicketOffice/wwwroot/css/Management.css diff --git a/TicketOffice/Pages/Account/Index.cshtml.cs b/TicketOffice/Pages/Account/Index.cshtml.cs deleted file mode 100644 index 8fc6309..0000000 --- a/TicketOffice/Pages/Account/Index.cshtml.cs +++ /dev/null @@ -1,10 +0,0 @@ -using Microsoft.AspNetCore.Mvc.RazorPages; - -namespace TicketOffice.Pages.Account; - -public class Index : PageModel -{ - public void OnGet() - { - } -} \ No newline at end of file diff --git a/TicketOffice/Pages/Account/Index.cshtml b/TicketOffice/Pages/Auth/Account.cshtml similarity index 51% rename from TicketOffice/Pages/Account/Index.cshtml rename to TicketOffice/Pages/Auth/Account.cshtml index 0e66df1..c7fb39e 100644 --- a/TicketOffice/Pages/Account/Index.cshtml +++ b/TicketOffice/Pages/Auth/Account.cshtml @@ -1,9 +1,11 @@ @page -@model TicketOffice.Pages.Account.Index +@model TicketOffice.Pages.Account.IndexModel @{ Layout = "~/Pages/Shared/_Layout.cshtml"; ViewData["Title"] = "Аккаунт"; } -} + + + diff --git a/TicketOffice/Pages/Auth/Account.cshtml.cs b/TicketOffice/Pages/Auth/Account.cshtml.cs new file mode 100644 index 0000000..2abf037 --- /dev/null +++ b/TicketOffice/Pages/Auth/Account.cshtml.cs @@ -0,0 +1,12 @@ +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; +using Microsoft.EntityFrameworkCore; +using TicketOffice.Data; +using TicketOffice.Models; + +namespace TicketOffice.Pages.Account; + +public class IndexModel : PageModel +{ + +} \ No newline at end of file diff --git a/TicketOffice/Pages/Auth/Index.cshtml b/TicketOffice/Pages/Auth/Index.cshtml new file mode 100644 index 0000000..463455d --- /dev/null +++ b/TicketOffice/Pages/Auth/Index.cshtml @@ -0,0 +1,6 @@ +@page +@model TicketOffice.Pages.Auth.IndexModel + +@{ + Layout = null; +} \ No newline at end of file diff --git a/TicketOffice/Pages/Auth/Index.cshtml.cs b/TicketOffice/Pages/Auth/Index.cshtml.cs new file mode 100644 index 0000000..57ab1b5 --- /dev/null +++ b/TicketOffice/Pages/Auth/Index.cshtml.cs @@ -0,0 +1,9 @@ +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; + +namespace TicketOffice.Pages.Auth; + +public class IndexModel : PageModel +{ + public ActionResult OnGet() => HttpContext.Session.GetInt32("UserId") is not null ? RedirectToPage("/Auth/Account") : RedirectToPage("/Auth/Login"); +} \ No newline at end of file diff --git a/TicketOffice/Pages/Auth/Login.cshtml b/TicketOffice/Pages/Auth/Login.cshtml index 708f454..0f46d9e 100644 --- a/TicketOffice/Pages/Auth/Login.cshtml +++ b/TicketOffice/Pages/Auth/Login.cshtml @@ -16,13 +16,13 @@
- @Model.emailValidation + @Model.EmailValidation

- @Model.passwordValidation + @Model.PasswordValidation

diff --git a/TicketOffice/Pages/Auth/Login.cshtml.cs b/TicketOffice/Pages/Auth/Login.cshtml.cs index 5492ae3..dcb275c 100644 --- a/TicketOffice/Pages/Auth/Login.cshtml.cs +++ b/TicketOffice/Pages/Auth/Login.cshtml.cs @@ -9,11 +9,13 @@ namespace TicketOffice.Pages.Auth; public class LoginModel : PageModel { - public IList User { get; set; } - [BindProperty] public string Email { get; set; } - [BindProperty] public string Password { get; set; } - public string emailValidation; - public string passwordValidation; + [BindProperty] public string Email { get; set; } = String.Empty; + [BindProperty] public string Password { get; set; } = String.Empty; + + public string EmailValidation; + public string PasswordValidation; + + private List User { get; set; } private readonly TicketOfficeContext _context; @@ -22,76 +24,71 @@ public class LoginModel : PageModel _context = context; } - public IActionResult OnGet() + public ActionResult OnGet() => ValidateSession() ? RedirectToPage("/Auth/Account") : Page(); + + public ActionResult OnPost() { - if (HttpContext.Session.GetInt32("UserId") != null) - { - return RedirectToPage("/Account/Index"); - } - - return Page(); - } - - public async Task OnPostAsync() - { - emailValidation = String.Empty; - passwordValidation = String.Empty; - - User = await _context.User - .Where(u => u.Email == Email) - .ToListAsync(); - - if (ValidateEmail(Email, out emailValidation) && ValidatePassword(Password, out passwordValidation)) + if (ValidateForm()) { HttpContext.Session.SetInt32("UserId", User.First().Id); - - return RedirectToPage("/Account/Index"); + return RedirectToPage("/Auth/Account"); } return Page(); } - public bool ValidateEmail(string email, out string validationError) + private bool ValidateForm() { - if (User.Any(u => u.Email == email)) - { - validationError = String.Empty; - return true; - } + User = _context.User + .Where(u => u.Email == Email) + .ToList(); + + return ValidateEmail(Email, out EmailValidation) && ValidatePassword(Password, out PasswordValidation); - if (String.IsNullOrWhiteSpace(email)) + bool ValidateEmail(string email, out string validationError) { - validationError = "Поле має бути заповненим"; - return false; - } + if (User.Count == 1) + { + validationError = String.Empty; + return true; + } - Regex emailRegex = new Regex(@"^[^@\s]+@[^@\s]+\.[^@\s]+$"); + if (String.IsNullOrWhiteSpace(email)) + { + validationError = "Поле має бути заповненим"; + return false; + } - if (!emailRegex.IsMatch(email)) - { - validationError = "E-mail некоректний"; + Regex emailRegex = new Regex(@"^[^@\s]+@[^@\s]+\.[^@\s]+$"); + + if (!emailRegex.IsMatch(email)) + { + validationError = "E-mail некоректний"; + return false; + } + + validationError = "E-mail не зареєстровано"; return false; } - validationError = "E-mail не зареєстровано"; - return false; - } - - public bool ValidatePassword(string password, out string validationError) - { - if (User.Where(u => u.Email == Email).Any(u => u.Password == password)) - { - validationError = String.Empty; - return true; - } - - if (String.IsNullOrWhiteSpace(password)) - { - validationError = "Поле має бути заповненим"; - return false; - } - - validationError = "Неправильний пароль"; - return false; + bool ValidatePassword(string password, out string validationError) + { + if (User.First().Password == password) + { + validationError = String.Empty; + return true; + } + + if (String.IsNullOrWhiteSpace(password)) + { + validationError = "Поле має бути заповненим"; + return false; + } + + validationError = "Неправильний пароль"; + return false; + } } + + private bool ValidateSession() => HttpContext.Session.GetInt32("UserId") is not null; } \ No newline at end of file diff --git a/TicketOffice/Pages/Auth/Registration.cshtml b/TicketOffice/Pages/Auth/Registration.cshtml index ccef313..c41abbc 100644 --- a/TicketOffice/Pages/Auth/Registration.cshtml +++ b/TicketOffice/Pages/Auth/Registration.cshtml @@ -16,13 +16,13 @@
- @Model.emailValidation + @Model.EmailValidation

- @Model.passwordValidation + @Model.PasswordValidation

diff --git a/TicketOffice/Pages/Auth/Registration.cshtml.cs b/TicketOffice/Pages/Auth/Registration.cshtml.cs index e8a6365..9a74067 100644 --- a/TicketOffice/Pages/Auth/Registration.cshtml.cs +++ b/TicketOffice/Pages/Auth/Registration.cshtml.cs @@ -9,11 +9,13 @@ namespace TicketOffice.Pages.Auth; public class RegistrationModel : PageModel { - public IList User { get; set; } - [BindProperty] public string Email { get; set; } - [BindProperty] public string Password { get; set; } - public string emailValidation; - public string passwordValidation; + [BindProperty] public string Email { get; set; } = String.Empty; + [BindProperty] public string Password { get; set; } = String.Empty; + + public string EmailValidation; + public string PasswordValidation; + + private List User { get; set; } private readonly TicketOfficeContext _context; @@ -22,96 +24,88 @@ public class RegistrationModel : PageModel _context = context; } - public IActionResult OnGet() - { - if (HttpContext.Session.GetInt32("UserId") != null) - { - return RedirectToPage("/Account/Index"); - } - - emailValidation = String.Empty; - passwordValidation = String.Empty; - - return Page(); - } + public ActionResult OnGet() => ValidateSession() ? RedirectToPage("/Auth/Account") : Page(); - public async Task OnPostAsync() + public ActionResult OnPostAsync() { - User = await _context.User - .Where(u => u.Email == Email) - .ToListAsync(); - - if (ValidateEmail(Email, out emailValidation) && ValidatePassword(Password, out passwordValidation)) + if (ValidateForm()) { - _context.User.Add(new User - { - Email = Email, - Password = Password - }); - await _context.SaveChangesAsync(); + _context.User.Add(new User {Email = Email, Password = Password}); + _context.SaveChanges(); - User = await _context.User + User = _context.User .Where(u => u.Email == Email) - .ToListAsync(); + .ToList(); HttpContext.Session.SetInt32("UserId", User.First().Id); - return RedirectToPage("/Account/Index"); + return RedirectToPage("/Auth/Account"); } - + return Page(); } - public bool ValidateEmail(string email, out string validationError) + private bool ValidateForm() { - Regex emailRegex = new Regex(@"^[^@\s]+@[^@\s]+\.[^@\s]+$"); - - if (String.IsNullOrWhiteSpace(email)) - { - validationError = "Поле має бути заповненим"; - return false; - } - - if (!emailRegex.IsMatch(email)) - { - validationError = "E-mail некоректний"; - return false; - } - - if (User.Any()) - { - validationError = "E-mail уже зареєстровано"; - return false; - } + return ValidateEmail(Email, out EmailValidation) && ValidatePassword(Password, out PasswordValidation); - validationError = String.Empty; - return true; - } - - public bool ValidatePassword(string passowrd, out string validationError) - { - if (String.IsNullOrWhiteSpace(passowrd)) - { - validationError = "Поле має бути заповненим"; - return false; - } - - if (passowrd.Length < 8 || passowrd.Length > 32) - { - validationError = "Паороль має бути від 8 до 32 символів"; - return false; - } - - Regex passwordRegex = new Regex(@"^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{8,}$"); - - if (!passwordRegex.IsMatch(passowrd)) - { - validationError = "Пароль має містити великі та малі латинські літери, цифри та спеціальні знаки (@, $, % та ін.)"; - return false; - } - - validationError = String.Empty; - return true; + bool ValidateEmail(string email, out string validationError) + { + Regex emailRegex = new Regex(@"^[^@\s]+@[^@\s]+\.[^@\s]+$"); + + if (String.IsNullOrWhiteSpace(email)) + { + validationError = "Поле має бути заповненим"; + return false; + } + + if (!emailRegex.IsMatch(email)) + { + validationError = "E-mail некоректний"; + return false; + } + + User = _context.User + .Where(u => u.Email == Email) + .ToList(); + + if (User.Any()) + { + validationError = "E-mail уже зареєстровано"; + return false; + } + + validationError = String.Empty; + return true; + } + + bool ValidatePassword(string passowrd, out string validationError) + { + if (String.IsNullOrWhiteSpace(passowrd)) + { + validationError = "Поле має бути заповненим"; + return false; + } + + if (passowrd.Length < 8 || passowrd.Length > 32) + { + validationError = "Паороль має бути від 8 до 32 символів"; + return false; + } + + Regex passwordRegex = new Regex(@"^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{8,}$"); + + if (!passwordRegex.IsMatch(passowrd)) + { + validationError = "Пароль має містити великі та малі латинські літери, цифри та спеціальні знаки (@, $, % та ін.)"; + return false; + } + + validationError = String.Empty; + return true; + } } + + bool ValidateSession() => HttpContext.Session.GetInt32("UserId") is not null; } \ No newline at end of file diff --git a/TicketOffice/Pages/Index.cshtml.cs b/TicketOffice/Pages/Index.cshtml.cs index 97f3265..15a3a7d 100644 --- a/TicketOffice/Pages/Index.cshtml.cs +++ b/TicketOffice/Pages/Index.cshtml.cs @@ -1,17 +1,5 @@ -using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; -using TicketOffice.Data; -using TicketOffice.Models; namespace TicketOffice.Pages; -public class IndexModel : PageModel -{ - public IndexModel(TicketOfficeContext context) - { - } - - public void OnGet() - { - } -} \ No newline at end of file +public class IndexModel : PageModel {} \ No newline at end of file diff --git a/TicketOffice/Pages/Routes/Index.cshtml b/TicketOffice/Pages/Routes/Index.cshtml index 194bbbc..ec6f3ac 100644 --- a/TicketOffice/Pages/Routes/Index.cshtml +++ b/TicketOffice/Pages/Routes/Index.cshtml @@ -175,7 +175,7 @@ else if (Model.Routes == null) {
-

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

+

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

} else @@ -288,26 +288,43 @@
- -
+ @if (HttpContext.Session.GetInt32("UserId").HasValue) + { + + } + else + { + + }
- -
+ @if (HttpContext.Session.GetInt32("UserId").HasValue) + { + + } + else + { + + }
- @for (int i = 1; i <= route.Capacity; i++) { - if (!route.Tickets.Any(t => t.PassengerPlace == i)) + if (route.Tickets.Any(t => t.PassengerPlace == i)) + { + + } + else { } } -
+ +
@@ -352,7 +369,14 @@
Закрити - + @if (HttpContext.Session.GetString("UserId") != null) + { + + } + else + { + Авторизуватись + }
diff --git a/TicketOffice/Pages/Routes/Index.cshtml.cs b/TicketOffice/Pages/Routes/Index.cshtml.cs index 2729eb0..166f29f 100644 --- a/TicketOffice/Pages/Routes/Index.cshtml.cs +++ b/TicketOffice/Pages/Routes/Index.cshtml.cs @@ -2,23 +2,21 @@ using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.EntityFrameworkCore; using TicketOffice.Data; +using TicketOffice.Models; using Route = TicketOffice.Models.Route; namespace TicketOffice.Pages.Routes; public class IndexModel : PageModel { - public List Routes { get; set; } + [BindProperty] public List Routes { get; set; } + [BindProperty] public Ticket Ticket { get; set; } [BindProperty(SupportsGet = true)] public string From { get; set; } [BindProperty(SupportsGet = true)] public string To { get; set; } [BindProperty(SupportsGet = true)] public DateTime Date { get; set; } = new DateTime(2022, 03, 28, 0, 0, 0).Date; [BindProperty(SupportsGet = true)] public string SortString { get; set; } - - public string PassengerFirstName { get; set; } - public string PassengerLastName { get; set; } - public int PassengerPlace { get; set; } - + private readonly TicketOfficeContext _context; public IndexModel(TicketOfficeContext context) @@ -45,10 +43,21 @@ public class IndexModel : PageModel if (!string.IsNullOrWhiteSpace(From) || !string.IsNullOrWhiteSpace(To)) { - //FilterRoutesByDate(); + FilterRoutesByDate(); } } + public ActionResult OnPost() + { + Ticket.User = _context.User.Where(u => u.Id == Ticket.UserId).ToList()[0]; + Ticket.Route = _context.Route.Where(r => r.Id == Ticket.RouteId).ToList()[0]; + + _context.Ticket.Add(Ticket); + _context.SaveChangesAsync(); + + return RedirectToPage("/Account/Index"); + } + public void OnGetSortByNumber() { OnGet(); @@ -87,9 +96,7 @@ public class IndexModel : PageModel public void OnGetSortByArrival() { OnGet(); - - - + Routes.Sort((x, y) => { TimeSpan? totalDuration; diff --git a/TicketOffice/Pages/Shared/_Layout.cshtml b/TicketOffice/Pages/Shared/_Layout.cshtml index 5347e0b..257325a 100644 --- a/TicketOffice/Pages/Shared/_Layout.cshtml +++ b/TicketOffice/Pages/Shared/_Layout.cshtml @@ -24,7 +24,7 @@
@if (Context.Session.GetString("UserId") != null) { - Аккаунт + Аккаунт } else { diff --git a/TicketOffice/Program.cs b/TicketOffice/Program.cs index 51e21ca..ccaeb4d 100644 --- a/TicketOffice/Program.cs +++ b/TicketOffice/Program.cs @@ -15,7 +15,7 @@ builder.Services.AddDistributedMemoryCache(); builder.Services.AddSession(options => { options.Cookie.Name = ".AutoBus.Session"; - options.IdleTimeout = TimeSpan.FromSeconds(10); + options.IdleTimeout = TimeSpan.FromSeconds(3600); options.Cookie.IsEssential = true; }); diff --git a/TicketOffice/wwwroot/css/Account.css b/TicketOffice/wwwroot/css/Account.css new file mode 100644 index 0000000..727c2c3 --- /dev/null +++ b/TicketOffice/wwwroot/css/Account.css @@ -0,0 +1,57 @@ +html { + font-size: 16px; + min-height: 100%; + font-family: 'Roboto', sans-serif; + background-color: #eaeef1; +} + +body { + margin: 0; +} + +.section { + width: 70rem; + margin: 1.5rem auto; +} + +.section-header { + text-align: center; + font-size: 1.25rem; + font-weight: 700; +} + +.section-text { + text-align: center; + font-size: 1rem; + font-weight: 700; + margin: 2rem 0; +} + +.link-btn { + line-height: 2.5rem; + padding: 0 1rem; + display: inline-block; + color: #1d4965; + font-weight: 700; + background: linear-gradient(0deg,#79b6db,#b3dbf2); + border: none; + border-radius: .3rem; + cursor: pointer; + text-decoration: none; +} + +.link { + color: #245c78; + text-decoration: none; + cursor: pointer; +} + +.link:hover { + text-decoration: underline; +} + +.divider { + background-color: #9ccdf0; + height: 0.2rem; + width: 100%; +} \ No newline at end of file diff --git a/TicketOffice/wwwroot/css/Index.css b/TicketOffice/wwwroot/css/Index.css index 9d53808..1231f84 100644 --- a/TicketOffice/wwwroot/css/Index.css +++ b/TicketOffice/wwwroot/css/Index.css @@ -39,7 +39,7 @@ div.title-block { div.title-header { color: white; - font-size: 2rem; + font-size: 1.8rem; font-weight: 700; height: fit-content; margin-bottom: 1rem; diff --git a/TicketOffice/wwwroot/css/Layout.css b/TicketOffice/wwwroot/css/Layout.css index 2ca6b3b..b2fbad7 100644 --- a/TicketOffice/wwwroot/css/Layout.css +++ b/TicketOffice/wwwroot/css/Layout.css @@ -14,7 +14,7 @@ body { .topnav { width: 100%; background-color: white; - border-bottom: .2rem solid #78b5da; + border-bottom: .2rem solid #9ccdf0; overflow: auto; } @@ -32,7 +32,7 @@ body { } .topnav a.active { - background-color: #79b6db; + background-color: #9ccdf0; } .topnav-right { diff --git a/TicketOffice/wwwroot/css/Management.css b/TicketOffice/wwwroot/css/Management.css new file mode 100644 index 0000000..e69de29 diff --git a/TicketOffice/wwwroot/css/Routes.css b/TicketOffice/wwwroot/css/Routes.css index e635c07..c988452 100644 --- a/TicketOffice/wwwroot/css/Routes.css +++ b/TicketOffice/wwwroot/css/Routes.css @@ -16,7 +16,7 @@ body { }*/ .wrapper { - width: 70rem; + width: 78rem; margin: 2.5rem auto; } @@ -26,13 +26,13 @@ body { background: #eaeef1; border-radius: 0.5rem; box-shadow: 0 1px 2.4rem 0 #c3c9d0; - padding: 1.5rem 1.5rem 1.5rem 1.5rem; + padding: 1.5rem; margin: 1.5rem 0; } .station, .date, div.search-btn { display: inline-block; - margin: 0 1.5rem; + margin: 0 2.2rem; } .title { @@ -68,7 +68,7 @@ input.search-btn { font-size: 1.6rem; font-weight: 700; line-height: 3rem; - padding: 0 1.5rem; + padding: 0 3rem; display: inline-block; background: linear-gradient(0deg,#79b6db,#b3dbf2); border: none; @@ -93,7 +93,8 @@ table { } th { - line-height: 4rem; + height: 6rem; + line-height: 1.6rem; background: #e6e9ed; border: 1px solid #d7dce1; padding: 0 1rem; @@ -103,10 +104,6 @@ th { color: #777a7e; } -.departure, .arrival { - line-height: 1.6rem; -} - .link-btn-sort { color: #777a7e; text-decoration: none;