cuqmbr/auto.bus_razor
1
0
Fork 0
Code Issues Pull Requests Activity

fix: email validation on registration, topnav links

Browse Source 
feat: add user session
This commit is contained in:
cuqmbr 2022-04-02 11:27:31 +03:00
parent 0472075a7b
commit aeb439e2bb
10 changed files with 67 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
TicketOffice/Pages/Account/Index.cshtml Normal file
View File

@ -0,0 +1,9 @@
@page
@model TicketOffice.Pages.Account.Index
@{
Layout = "~/Pages/Shared/_Layout.cshtml";
ViewData["Title"] = "Аккаунт";
}
}

10
TicketOffice/Pages/Account/Index.cshtml.cs Normal file
View File

@ -0,0 +1,10 @@
using Microsoft.AspNetCore.Mvc.RazorPages;
namespace TicketOffice.Pages.Account;
public class Index : PageModel
{
public void OnGet()
{
}
}

2
TicketOffice/Pages/Auth/Login.cshtml
View File

@ -30,7 +30,7 @@
<div class="hint">
Не маєте аккаунта?
<a href="/auth/registration" class="link">Зареєструватись</a>
<a href="/Auth/Registration" class="link">Зареєструватись</a>
</div>
</form>
</div>

11
TicketOffice/Pages/Auth/Login.cshtml.cs
View File

@ -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();

2
TicketOffice/Pages/Auth/Registration.cshtml
View File

@ -30,7 +30,7 @@
<div class="hint">
Вже маєте аккаунт?
<a href="/auth/login" class="link">Авторизуватись</a>
<a href="/Auth/Login" class="link">Авторизуватись</a>
</div>
</form>
</div>

16
TicketOffice/Pages/Auth/Registration.cshtml.cs
View File

@ -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();

13
TicketOffice/Pages/Shared/_Layout.cshtml
View File

@ -16,13 +16,20 @@
<div class="topnav">
@{
string path = @Model.Request.Path.ToString();
string path = Model.Request.Path.ToString().ToLower();
}
<a class="@(path == "/" ? "active" : "")" href="/">Головна</a>
<a class="@(path.Contains("routes") ? "active" : "")" href="/routes">Пошук маршрутів</a>
<a class="@(path.Contains("routes") ? "active" : "")" href="/Routes">Пошук маршрутів</a>
<div class="topnav-right">
<a class="@(path.Contains("auth") ? "active" : "")" href="/auth/login">Авторизація</a>
@if (Context.Session.GetString("UserId") != null)
{
<a class="@(path.Contains("account") ? "active" : "")" href="/Account">Аккаунт</a>
}
else
{
<a class="@(path.Contains("auth") ? "active" : "")" href="/Auth/Login">Авторизація</a>
}
</div>
</div>

48
TicketOffice/Pages/Shared/_Layout.cshtml.css
View File

@ -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;
}

13
TicketOffice/Program.cs
View File

@ -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<TicketOfficeContext>(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();

2
TicketOffice/TicketOffice.csproj
View File

@ -9,11 +9,11 @@
<ItemGroup>
<Folder Include="Data" />
<Folder Include="Migrations" />
<Folder Include="Pages\Management" />
<Folder Include="wwwroot\db" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Session" Version="2.2.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.3">
<PrivateAssets>all</PrivateAssets>