diff options
| author | ivar <i@oiee.no> | 2024-03-19 01:02:22 +0100 |
|---|---|---|
| committer | ivar <i@oiee.no> | 2024-03-19 01:02:22 +0100 |
| commit | 5f604b3052dab1d51dc130df2470bf330b283ec6 (patch) | |
| tree | ae00e1fe4542850467555b4e3af41964ba8d878b /code/api/Pages | |
| parent | 63cf177e8cf22e349534664d59a6926f8b36863d (diff) | |
| download | storage-5f604b3052dab1d51dc130df2470bf330b283ec6.tar.xz storage-5f604b3052dab1d51dc130df2470bf330b283ec6.zip | |
Max lenghts on db schema
Use latest temporal from cdn
Implement majority of translation functionality
Major refinements/bugs
Diffstat (limited to 'code/api/Pages')
| -rw-r--r-- | code/api/Pages/BasePageModel.cs | 20 | ||||
| -rw-r--r-- | code/api/Pages/Home.cshtml | 8 | ||||
| -rw-r--r-- | code/api/Pages/Home.cshtml.cs | 9 | ||||
| -rw-r--r-- | code/api/Pages/Index.cshtml | 5 | ||||
| -rw-r--r-- | code/api/Pages/Index.cshtml.cs | 12 | ||||
| -rw-r--r-- | code/api/Pages/Login.cshtml | 7 | ||||
| -rw-r--r-- | code/api/Pages/Login.cshtml.cs | 18 | ||||
| -rw-r--r-- | code/api/Pages/Shared/Components/Header/Default.cshtml | 2 | ||||
| -rw-r--r-- | code/api/Pages/Shared/Components/Header/Header.cs | 11 | ||||
| -rw-r--r-- | code/api/Pages/_Layout.cshtml | 7 | ||||
| -rw-r--r-- | code/api/Pages/_ViewImports.cshtml | 3 |
11 files changed, 51 insertions, 51 deletions
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"; -} - -<h1>Home</h1>
\ No newline at end of file +<h1>Home</h1> 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 { <link rel="stylesheet" href="~/styles/page-specific/login.css" asp-append-version="true"> } -<form id="login-form"> +<form id="login-form" method="post"> <fieldset> <legend>Login</legend> <div class="error"> 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<SharedResources> localizer) : ViewComponent +{ + public string Home { get; set; } + private readonly IStringLocalizer<SharedResources> _localizer = localizer; + + public async Task<IViewComponentResult> 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 @@ <html lang="en"> <head> <meta charset="UTF-8"> - <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"> - <meta http-equiv="X-UA-Compatible" content="ie=edge"> + <meta name="viewport" content="width=device-width, initial-scale=1.0"> <link rel="stylesheet" href="~/styles/base.css" asp-append-version="true"> @await RenderSectionAsync("Head", false) <title>@ViewData["Title"] - Storage</title> @@ -22,7 +21,7 @@ </header> } @RenderBody() -<script src="~/scripts/module.mjs" asp-append-version="true" type="module"></script> +<script src="https://cdn.jsdelivr.net/npm/temporal-polyfill@0.2.3/global.js"></script> <script src="~/scripts/helpers.js" asp-append-version="true"></script> <script src="~/scripts/base.js" asp-append-version="true"></script> @if (User.Identity?.IsAuthenticated ?? false) { @@ -31,4 +30,4 @@ } @await RenderSectionAsync("Scripts", false) </body> -</html>
\ No newline at end of file +</html> 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 |
