diff --git a/src/admin/Bootstrap.Admin/Controllers/AccountController.cs b/src/admin/Bootstrap.Admin/Controllers/AccountController.cs index ca37bef0..1ffcf93c 100644 --- a/src/admin/Bootstrap.Admin/Controllers/AccountController.cs +++ b/src/admin/Bootstrap.Admin/Controllers/AccountController.cs @@ -41,6 +41,7 @@ namespace Bootstrap.Admin.Controllers var authenticationType = User.Identity.AuthenticationType; await HttpContext.SignOutAsync(); var urlReferrer = Request.Headers["Referer"].FirstOrDefault(); + if (urlReferrer.Contains("/Pages", StringComparison.OrdinalIgnoreCase)) urlReferrer = "/Pages"; return View(new LockModel(User.Identity.Name) { AuthenticationType = authenticationType, diff --git a/src/admin/Bootstrap.Admin/Pages/Admin/Home.razor b/src/admin/Bootstrap.Admin/Pages/Admin/Home.razor index 63c0a99e..97e00e7c 100644 --- a/src/admin/Bootstrap.Admin/Pages/Admin/Home.razor +++ b/src/admin/Bootstrap.Admin/Pages/Admin/Home.razor @@ -1,12 +1,10 @@ @page "/Pages/Admin/Dicts" @page "/Pages/Admin/Groups" -@page "/Pages/Account/Lock" @page "/Pages/Admin/Menus" @page "/Pages/Admin/Profiles" @page "/Pages/Admin/Roles" @page "/Pages/Admin/Users" @page "/Pages/Admin/Settings" -@page "/Pages/Home/Index" @page "/Pages/Admin/Messages" @page "/Pages/Admin/Tasks" @page "/Pages/Admin/Notifications" @@ -17,5 +15,4 @@ @page "/Pages/Admin/Online" @page "/Pages/Admin/Analyse" @page "/Pages/Admin/Exceptions" -@page "/Pages/Admin/Healths" @page "/Pages/Admin/Mobile" diff --git a/src/admin/Bootstrap.Admin/Pages/Admin/Lock.razor b/src/admin/Bootstrap.Admin/Pages/Admin/Lock.razor deleted file mode 100644 index 317f9fb5..00000000 --- a/src/admin/Bootstrap.Admin/Pages/Admin/Lock.razor +++ /dev/null @@ -1,6 +0,0 @@ - -

Lock

- -@code { - -} diff --git a/src/admin/Bootstrap.Admin/Pages/Home.razor b/src/admin/Bootstrap.Admin/Pages/Home.razor new file mode 100644 index 00000000..6434146b --- /dev/null +++ b/src/admin/Bootstrap.Admin/Pages/Home.razor @@ -0,0 +1,15 @@ +@page "/Pages/Account/Lock" +@page "/Pages/Admin/Healths" +@page "/Pages/Home" +@page "/Pages/Home/Index" +@layout DefaultLayout +@attribute [Authorize] +@inject NavigationManager NavigationManager + +@code { + protected override void OnInitialized() + { + var url = NavigationManager.Uri.Replace("/Pages", ""); + NavigationManager.NavigateTo(url, true); + } +}