From aeb439e2bb0aa6cc73c9fc4ed804620b8d8a0e5d Mon Sep 17 00:00:00 2001 From: cuqmbr Date: Sat, 2 Apr 2022 11:27:31 +0300 Subject: [PATCH] fix: email validation on registration, topnav links feat: add user session --- TicketOffice/Pages/Account/Index.cshtml | 9 ++++ TicketOffice/Pages/Account/Index.cshtml.cs | 10 ++++ TicketOffice/Pages/Auth/Login.cshtml | 2 +- TicketOffice/Pages/Auth/Login.cshtml.cs | 11 ++++- TicketOffice/Pages/Auth/Registration.cshtml | 2 +- .../Pages/Auth/Registration.cshtml.cs | 16 ++++++- TicketOffice/Pages/Shared/_Layout.cshtml | 13 +++-- TicketOffice/Pages/Shared/_Layout.cshtml.css | 48 ------------------- TicketOffice/Program.cs | 13 ++++- TicketOffice/TicketOffice.csproj | 2 +- 10 files changed, 67 insertions(+), 59 deletions(-) create mode 100644 TicketOffice/Pages/Account/Index.cshtml create mode 100644 TicketOffice/Pages/Account/Index.cshtml.cs delete mode 100644 TicketOffice/Pages/Shared/_Layout.cshtml.css diff --git a/TicketOffice/Pages/Account/Index.cshtml b/TicketOffice/Pages/Account/Index.cshtml new file mode 100644 index 0000000..0e66df1 --- /dev/null +++ b/TicketOffice/Pages/Account/Index.cshtml @@ -0,0 +1,9 @@ +@page +@model TicketOffice.Pages.Account.Index + +@{ + Layout = "~/Pages/Shared/_Layout.cshtml"; + ViewData["Title"] = "Аккаунт"; +} +} + diff --git a/TicketOffice/Pages/Account/Index.cshtml.cs b/TicketOffice/Pages/Account/Index.cshtml.cs new file mode 100644 index 0000000..8fc6309 --- /dev/null +++ b/TicketOffice/Pages/Account/Index.cshtml.cs @@ -0,0 +1,10 @@ +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/Auth/Login.cshtml b/TicketOffice/Pages/Auth/Login.cshtml index b6a1902..708f454 100644 --- a/TicketOffice/Pages/Auth/Login.cshtml +++ b/TicketOffice/Pages/Auth/Login.cshtml @@ -30,7 +30,7 @@
Не маєте аккаунта? - Зареєструватись + Зареєструватись
\ No newline at end of file diff --git a/TicketOffice/Pages/Auth/Login.cshtml.cs b/TicketOffice/Pages/Auth/Login.cshtml.cs index 1af14b8..d440d8d 100644 --- a/TicketOffice/Pages/Auth/Login.cshtml.cs +++ b/TicketOffice/Pages/Auth/Login.cshtml.cs @@ -14,7 +14,7 @@ public class LoginModel : PageModel [BindProperty] public string Password { get; set; } public string emailValidation; public string passwordValidation; - + private readonly TicketOfficeContext _context; public LoginModel(TicketOfficeContext context) @@ -24,6 +24,11 @@ public class LoginModel : PageModel public IActionResult OnGet() { + if (HttpContext.Session.GetInt32("UserId") != null) + { + return RedirectToPage("/Account/Index"); + } + return Page(); } @@ -38,7 +43,9 @@ public class LoginModel : PageModel if (ValidateEmail(Email, out emailValidation) && ValidatePassword(Password, out passwordValidation)) { - return RedirectToPage("/Index"); + HttpContext.Session.SetInt32("UserId", User.First().Id); + + return RedirectToPage("Account/Index"); } return Page(); diff --git a/TicketOffice/Pages/Auth/Registration.cshtml b/TicketOffice/Pages/Auth/Registration.cshtml index 4d68898..ccef313 100644 --- a/TicketOffice/Pages/Auth/Registration.cshtml +++ b/TicketOffice/Pages/Auth/Registration.cshtml @@ -30,7 +30,7 @@
Вже маєте аккаунт? - Авторизуватись + Авторизуватись
\ No newline at end of file diff --git a/TicketOffice/Pages/Auth/Registration.cshtml.cs b/TicketOffice/Pages/Auth/Registration.cshtml.cs index 2ca672e..ca418ea 100644 --- a/TicketOffice/Pages/Auth/Registration.cshtml.cs +++ b/TicketOffice/Pages/Auth/Registration.cshtml.cs @@ -14,7 +14,7 @@ public class RegistrationModel : PageModel [BindProperty] public string Password { get; set; } public string emailValidation; public string passwordValidation; - + private readonly TicketOfficeContext _context; public RegistrationModel(TicketOfficeContext context) @@ -24,6 +24,11 @@ public class RegistrationModel : PageModel public IActionResult OnGet() { + if (HttpContext.Session.GetInt32("UserId") != null) + { + return RedirectToPage("/Account/Index"); + } + emailValidation = String.Empty; passwordValidation = String.Empty; @@ -45,7 +50,14 @@ public class RegistrationModel : PageModel }); await _context.SaveChangesAsync(); - return RedirectToPage("/Index"); + + User = await _context.User + .Where(u => u.Email == Email) + .ToListAsync(); + + HttpContext.Session.SetInt32("UserId", User.First().Id); + + return RedirectToPage("Account/Index"); } return Page(); diff --git a/TicketOffice/Pages/Shared/_Layout.cshtml b/TicketOffice/Pages/Shared/_Layout.cshtml index eabffe1..5347e0b 100644 --- a/TicketOffice/Pages/Shared/_Layout.cshtml +++ b/TicketOffice/Pages/Shared/_Layout.cshtml @@ -16,13 +16,20 @@
@{ - string path = @Model.Request.Path.ToString(); + string path = Model.Request.Path.ToString().ToLower(); } Головна - Пошук маршрутів + Пошук маршрутів
- Авторизація + @if (Context.Session.GetString("UserId") != null) + { + Аккаунт + } + else + { + Авторизація + }
diff --git a/TicketOffice/Pages/Shared/_Layout.cshtml.css b/TicketOffice/Pages/Shared/_Layout.cshtml.css deleted file mode 100644 index a72cbea..0000000 --- a/TicketOffice/Pages/Shared/_Layout.cshtml.css +++ /dev/null @@ -1,48 +0,0 @@ -/* Please see documentation at https://docs.microsoft.com/aspnet/core/client-side/bundling-and-minification -for details on configuring this project to bundle and minify static web assets. */ - -a.navbar-brand { - white-space: normal; - text-align: center; - word-break: break-all; -} - -a { - color: #0077cc; -} - -.btn-primary { - color: #fff; - background-color: #1b6ec2; - border-color: #1861ac; -} - -.nav-pills .nav-link.active, .nav-pills .show > .nav-link { - color: #fff; - background-color: #1b6ec2; - border-color: #1861ac; -} - -.border-top { - border-top: 1px solid #e5e5e5; -} -.border-bottom { - border-bottom: 1px solid #e5e5e5; -} - -.box-shadow { - box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05); -} - -button.accept-policy { - font-size: 1rem; - line-height: inherit; -} - -.footer { - position: absolute; - bottom: 0; - width: 100%; - white-space: nowrap; - line-height: 60px; -} diff --git a/TicketOffice/Program.cs b/TicketOffice/Program.cs index 10f2e7c..51e21ca 100644 --- a/TicketOffice/Program.cs +++ b/TicketOffice/Program.cs @@ -5,11 +5,20 @@ using TicketOffice.Models; var builder = WebApplication.CreateBuilder(args); // Add services to the container. -builder.Services.AddRazorPages(); +builder.Services.AddRazorPages() + .AddSessionStateTempDataProvider();; builder.Services.AddDbContext(options => options.UseSqlite(builder.Configuration.GetConnectionString("TicketOfficeContext"))); +builder.Services.AddDistributedMemoryCache(); +builder.Services.AddSession(options => +{ + options.Cookie.Name = ".AutoBus.Session"; + options.IdleTimeout = TimeSpan.FromSeconds(10); + options.Cookie.IsEssential = true; +}); + var app = builder.Build(); using var scope = app.Services.CreateScope(); @@ -30,6 +39,8 @@ app.UseHttpsRedirection(); app.UseRouting(); +app.UseSession(); + app.MapRazorPages(); app.Run(); diff --git a/TicketOffice/TicketOffice.csproj b/TicketOffice/TicketOffice.csproj index 25e26a1..4692a94 100644 --- a/TicketOffice/TicketOffice.csproj +++ b/TicketOffice/TicketOffice.csproj @@ -9,11 +9,11 @@ - + all