From 5f604b3052dab1d51dc130df2470bf330b283ec6 Mon Sep 17 00:00:00 2001 From: ivar Date: Tue, 19 Mar 2024 01:02:22 +0100 Subject: Max lenghts on db schema Use latest temporal from cdn Implement majority of translation functionality Major refinements/bugs --- code/api/Pages/BasePageModel.cs | 20 ++++++++++---------- code/api/Pages/Home.cshtml | 8 ++------ code/api/Pages/Home.cshtml.cs | 9 +++++---- code/api/Pages/Index.cshtml | 5 +---- code/api/Pages/Index.cshtml.cs | 12 ++++++------ code/api/Pages/Login.cshtml | 7 ++----- code/api/Pages/Login.cshtml.cs | 18 ++++++++---------- .../Pages/Shared/Components/Header/Default.cshtml | 2 ++ code/api/Pages/Shared/Components/Header/Header.cs | 11 +++++++++++ code/api/Pages/_Layout.cshtml | 7 +++---- code/api/Pages/_ViewImports.cshtml | 3 +-- 11 files changed, 51 insertions(+), 51 deletions(-) create mode 100644 code/api/Pages/Shared/Components/Header/Default.cshtml create mode 100644 code/api/Pages/Shared/Components/Header/Header.cs (limited to 'code/api/Pages') diff --git a/code/api/Pages/BasePageModel.cs b/code/api/Pages/BasePageModel.cs index 7858dc4..47f763a 100644 --- a/code/api/Pages/BasePageModel.cs +++ b/code/api/Pages/BasePageModel.cs @@ -1,17 +1,17 @@ using Microsoft.AspNetCore.Mvc.Filters; -namespace I2R.Storage.Api.Pages; +namespace Quality.Storage.Api.Pages; public class BasePageModel : PageModel { - public LoggedInUserModel LoggedInUser => new(User); - public bool IsAutenticated => User.Identity?.IsAuthenticated ?? false; + public LoggedInUserModel LoggedInUser => new(User); + public bool IsAuthenticated => User.Identity?.IsAuthenticated ?? false; - public override void OnPageHandlerExecuting(PageHandlerExecutingContext context) { - if (!context.HttpContext.User.Identity?.IsAuthenticated ?? true) { - context.Result = new RedirectResult("/login"); - } + public override void OnPageHandlerExecuting(PageHandlerExecutingContext context) { + if (!(context.HttpContext.User.Identity?.IsAuthenticated ?? true) && !context.HttpContext.Request.Path.StartsWithSegments("/login")) { + context.Result = new RedirectResult("/login"); + } - base.OnPageHandlerExecuting(context); - } -} \ No newline at end of file + base.OnPageHandlerExecuting(context); + } +} diff --git a/code/api/Pages/Home.cshtml b/code/api/Pages/Home.cshtml index b914874..1b51cb7 100644 --- a/code/api/Pages/Home.cshtml +++ b/code/api/Pages/Home.cshtml @@ -1,8 +1,4 @@ @page -@model I2R.Storage.Api.Pages.Home +@model Quality.Storage.Api.Pages.Home -@{ - ViewData["Title"] = "Home"; -} - -

Home

\ No newline at end of file +

Home

diff --git a/code/api/Pages/Home.cshtml.cs b/code/api/Pages/Home.cshtml.cs index 0d8bcd6..dbf56e1 100644 --- a/code/api/Pages/Home.cshtml.cs +++ b/code/api/Pages/Home.cshtml.cs @@ -1,7 +1,8 @@ -namespace I2R.Storage.Api.Pages; +namespace Quality.Storage.Api.Pages; public class Home : BasePageModel { - public Home() : base() { } - public void OnGet() { } -} \ No newline at end of file + public void OnGet() { + ViewData["Title"] = "Home"; + } +} diff --git a/code/api/Pages/Index.cshtml b/code/api/Pages/Index.cshtml index 4015b8e..713bf74 100644 --- a/code/api/Pages/Index.cshtml +++ b/code/api/Pages/Index.cshtml @@ -1,5 +1,2 @@ @page -@model I2R.Storage.Api.Pages.Index -@{ - ViewData["Title"] = "Home"; -} +@model Quality.Storage.Api.Pages.Index diff --git a/code/api/Pages/Index.cshtml.cs b/code/api/Pages/Index.cshtml.cs index 8129a9b..86a9d0b 100644 --- a/code/api/Pages/Index.cshtml.cs +++ b/code/api/Pages/Index.cshtml.cs @@ -1,8 +1,8 @@ -namespace I2R.Storage.Api.Pages; +namespace Quality.Storage.Api.Pages; -public class Index : PageModel +public class Index : BasePageModel { - public ActionResult OnGet() { - return User.Identity.IsAuthenticated ? Redirect("/home") : Redirect("/login"); - } -} \ No newline at end of file + public void OnGet() { + ViewData["Title"] = "Index"; + } +} diff --git a/code/api/Pages/Login.cshtml b/code/api/Pages/Login.cshtml index 0e8b304..128d70a 100644 --- a/code/api/Pages/Login.cshtml +++ b/code/api/Pages/Login.cshtml @@ -1,14 +1,11 @@ @page -@model I2R.Storage.Api.Pages.Login -@{ - ViewData["Title"] = "Login"; -} +@model Quality.Storage.Api.Pages.Login @section Head { } -
+
Login
diff --git a/code/api/Pages/Login.cshtml.cs b/code/api/Pages/Login.cshtml.cs index 90948b6..5726535 100644 --- a/code/api/Pages/Login.cshtml.cs +++ b/code/api/Pages/Login.cshtml.cs @@ -1,12 +1,10 @@ -namespace I2R.Storage.Api.Pages; +namespace Quality.Storage.Api.Pages; -public class Login : PageModel +public class Login : BasePageModel { - public ActionResult OnGet() { - if (User.Identity?.IsAuthenticated ?? false) { - return Redirect("/home"); - } - - return Page(); - } -} \ No newline at end of file + public ActionResult OnGet() { + ViewData["Title"] = "Login"; + if (IsAuthenticated) return Redirect("/home"); + return Page(); + } +} diff --git a/code/api/Pages/Shared/Components/Header/Default.cshtml b/code/api/Pages/Shared/Components/Header/Default.cshtml new file mode 100644 index 0000000..8234a97 --- /dev/null +++ b/code/api/Pages/Shared/Components/Header/Default.cshtml @@ -0,0 +1,2 @@ +@model Quality.Storage.Api.Pages.Shared.Components.Header.Header + diff --git a/code/api/Pages/Shared/Components/Header/Header.cs b/code/api/Pages/Shared/Components/Header/Header.cs new file mode 100644 index 0000000..ad0b75b --- /dev/null +++ b/code/api/Pages/Shared/Components/Header/Header.cs @@ -0,0 +1,11 @@ +namespace Quality.Storage.Api.Pages.Shared.Components.Header; + +public class Header(IStringLocalizer localizer) : ViewComponent +{ + public string Home { get; set; } + private readonly IStringLocalizer _localizer = localizer; + + public async Task InvokeAsync() { + return View(); + } +} diff --git a/code/api/Pages/_Layout.cshtml b/code/api/Pages/_Layout.cshtml index d587a07..1a69641 100644 --- a/code/api/Pages/_Layout.cshtml +++ b/code/api/Pages/_Layout.cshtml @@ -2,8 +2,7 @@ - - + @await RenderSectionAsync("Head", false) @ViewData["Title"] - Storage @@ -22,7 +21,7 @@ } @RenderBody() - + @if (User.Identity?.IsAuthenticated ?? false) { @@ -31,4 +30,4 @@ } @await RenderSectionAsync("Scripts", false) - \ No newline at end of file + diff --git a/code/api/Pages/_ViewImports.cshtml b/code/api/Pages/_ViewImports.cshtml index c4934c1..ffec8ef 100644 --- a/code/api/Pages/_ViewImports.cshtml +++ b/code/api/Pages/_ViewImports.cshtml @@ -1,3 +1,2 @@ -@using I2R.Storage.Api -@namespace I2R.Storage.Api.Pages +@namespace I2R.Storage.Api.Pages @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers \ No newline at end of file -- cgit v1.3