Group signed out pages

btcpayserver · Apr 17, 2024 · 1f42ad3 · 1f42ad3
1 parent 399b8d6
commit 1f42ad3
Show file tree

Hide file tree

Showing 8 changed files with 82 additions and 76 deletions.
diff --git a/BTCPayApp.UI/Layout/SimpleLayout.razor b/BTCPayApp.UI/Layout/SimpleLayout.razor
@@ -18,7 +18,9 @@
     }
     <main id="MainContent">
         <SectionOutlet SectionName="main-top"/>
-        @Body
+        <div class="container">
+            @Body
+        </div>
         <SectionOutlet SectionName="main-bottom"/>
     </main>
     <SectionOutlet SectionName="bottom" />

diff --git a/BTCPayApp.UI/Layout/SimpleLayout.razor.css b/BTCPayApp.UI/Layout/SimpleLayout.razor.css
@@ -1,4 +1,4 @@
-.container {
+#SimpleLayout {
   --logo-height: 5rem;
   --padding-vertical: 15vh;
 

diff --git a/BTCPayApp.UI/Pages/DashboardPage.razor b/BTCPayApp.UI/Pages/DashboardPage.razor
@@ -18,58 +18,62 @@
 <section class="container">
     @if (IsInitialized && !IsLoading)
     {
-    <AuthorizeView>
-        <Authorized>
-            <h1>Hello, @context.User.Identity?.Name!</h1>
+        <AuthorizeView>
+            <Authorized>
+                <h1>Hello, @context.User.Identity?.Name!</h1>
 
-            @if (_userInfo != null)
-            {
-            <div class="mb-4">
-                ID: @_userInfo.UserId<br />
-                Email: @_userInfo.Email<br />
-                Roles: @(_userInfo.Roles?.Any() is true ? string.Join(", ", _userInfo.Roles) : "none")
-            </div>
-
-            if (_userInfo.Stores?.Any() is true)
-            {
-            <ul>
-                @foreach (var store in _userInfo.Stores)
+                @if (_userInfo != null)
                 {
-                <li>
-                    <div>
-                        <strong>@store.Name</strong>
-                        <span class="badge bg-light">@store.RoleId</span>
-                        @if (store.Archived)
-                        {
-                        <span class="badge bg-info">archived</span>
-                        }
+                    <div class="mb-4">
+                        ID: @_userInfo.UserId<br />
+                        Email: @_userInfo.Email<br />
+                        Roles: @(_userInfo.Roles?.Any() is true ? string.Join(", ", _userInfo.Roles) : "none")
                     </div>
-                    <div></div>
 
-                    @if (store.Permissions?.Any() is true)
+                    if (_userInfo.Stores?.Any() is true)
                     {
-                    <ul>
-                        @foreach (var permission in store.Permissions)
-                        {
-                        <li>@permission</li>
-                        }
-                    </ul>
+                        <ul>
+                            @foreach (var store in _userInfo.Stores)
+                            {
+                                <li>
+                                    <div>
+                                        <strong>@store.Name</strong>
+                                        <span class="badge bg-light">@store.RoleId</span>
+                                        @if (store.Archived)
+                                        {
+                                            <span class="badge bg-info">archived</span>
+                                        }
+                                    </div>
+                                    <div></div>
+
+                                    @if (store.Permissions?.Any() is true)
+                                    {
+                                        <ul>
+                                            @foreach (var permission in store.Permissions)
+                                            {
+                                                <li>@permission</li>
+                                            }
+                                        </ul>
+                                    }
+                                    else
+                                    {
+                                        <div class="text-secondary">No permissions</div>
+                                    }
+                                </li>
+                            }
+                        </ul>
                     }
                     else
                     {
-                    <div class="text-secondary">No permissions</div>
+                        <p class="text-secondary">No stores</p>
                     }
-                </li>
                 }
-            </ul>
-            }
-            else
-            {
-            <p class="text-secondary">No stores</p>
-            }
-            }
-        </Authorized>
-    </AuthorizeView>
+
+                <NavLink class="btn btn-outline-danger" href="@Routes.Logout" Match="NavLinkMatch.All">
+                    <span>Logout</span>
+                </NavLink>
+            </Authorized>
+        </AuthorizeView>
 
     @*if (State.Value.PairConfig is null && State.Value.WalletConfig is null)
     {

diff --git a/BTCPayApp.UI/Pages/ConnectPage.razor → ...yApp.UI/Pages/SignedOut/ConnectPage.razor b/BTCPayApp.UI/Pages/ConnectPage.razor → ...yApp.UI/Pages/SignedOut/ConnectPage.razor
diff --git a/BTCPayApp.UI/Pages/ForgotPasswordPage.razor → .../Pages/SignedOut/ForgotPasswordPage.razor b/BTCPayApp.UI/Pages/ForgotPasswordPage.razor → .../Pages/SignedOut/ForgotPasswordPage.razor
@@ -11,6 +11,18 @@
 
 <PageTitle>@GetTitle()</PageTitle>
 
+<SectionContent SectionName="main-top">
+    <h1>@GetTitle()</h1>
+    @if (!string.IsNullOrEmpty(_errorMessage))
+    {
+    <div class="alert alert-danger mb-3">@_errorMessage</div>
+    }
+    else if (!string.IsNullOrEmpty(_successMessage))
+    {
+    <div class="alert alert-success mb-3">@_successMessage</div>
+    }
+</SectionContent>
+
 <EditForm Model="@Model" OnValidSubmit="HandleValidSubmit" FormName="ForgotPassword" method="post">
     <DataAnnotationsValidator />
     <div class="mb-3">
@@ -56,18 +68,6 @@
     }
 </EditForm>
 
-<SectionContent SectionName="main-top">
-    <h1>@GetTitle()</h1>
-    @if (!string.IsNullOrEmpty(_errorMessage))
-    {
-        <div class="alert alert-danger mb-3">@_errorMessage</div>
-    }
-    else if (!string.IsNullOrEmpty(_successMessage))
-    {
-        <div class="alert alert-success mb-3">@_successMessage</div>
-    }
-</SectionContent>
-
 @code {
     [Parameter, EditorRequired]
     [SupplyParameterFromQuery]

diff --git a/BTCPayApp.UI/Pages/LoginPage.razor → BTCPayApp.UI/Pages/SignedOut/LoginPage.razor b/BTCPayApp.UI/Pages/LoginPage.razor → BTCPayApp.UI/Pages/SignedOut/LoginPage.razor
@@ -13,6 +13,18 @@
 
 <PageTitle>@GetTitle()</PageTitle>
 
+<SectionContent SectionName="main-top">
+    <h1>@GetTitle()</h1>
+    @if (!string.IsNullOrEmpty(_errorMessage))
+    {
+    <div class="alert alert-danger mb-3">@_errorMessage</div>
+    }
+    else if (!string.IsNullOrEmpty(_successMessage))
+    {
+    <div class="alert alert-success mb-3">@_successMessage</div>
+    }
+</SectionContent>
+
 <EditForm Model="@Model" OnValidSubmit="HandleValidSubmit" FormName="Login" method="post">
     <DataAnnotationsValidator />
     <div class="mb-3" hidden="@Model.RequireTwoFactor">
@@ -55,18 +67,6 @@
     }
 </EditForm>
 
-<SectionContent SectionName="main-top">
-    <h1>@GetTitle()</h1>
-    @if (!string.IsNullOrEmpty(_errorMessage))
-    {
-        <div class="alert alert-danger mb-3">@_errorMessage</div>
-    }
-    else if (!string.IsNullOrEmpty(_successMessage))
-    {
-        <div class="alert alert-success mb-3">@_successMessage</div>
-    }
-</SectionContent>
-
 @code {
     [Parameter]
     [SupplyParameterFromQuery]

diff --git a/BTCPayApp.UI/Pages/RegisterPage.razor → ...App.UI/Pages/SignedOut/RegisterPage.razor b/BTCPayApp.UI/Pages/RegisterPage.razor → ...App.UI/Pages/SignedOut/RegisterPage.razor
@@ -10,6 +10,14 @@
 
 <PageTitle>@GetTitle()</PageTitle>
 
+<SectionContent SectionName="main-top">
+    <h1>@GetTitle()</h1>
+    @if (!string.IsNullOrEmpty(_errorMessage))
+    {
+    <div class="alert alert-danger mb-3">@_errorMessage</div>
+    }
+</SectionContent>
+
 <EditForm Model="@Model" OnValidSubmit="HandleValidSubmit" FormName="Register" method="post">
     <DataAnnotationsValidator />
     <div class="mb-3">
@@ -39,14 +47,6 @@
     </p>
 </EditForm>
 
-<SectionContent SectionName="main-top">
-    <h1>@GetTitle()</h1>
-    @if (!string.IsNullOrEmpty(_errorMessage))
-    {
-        <div class="alert alert-danger mb-3">@_errorMessage</div>
-    }
-</SectionContent>
-
 @code {
     [Parameter, EditorRequired]
     [SupplyParameterFromQuery]

diff --git a/BTCPayApp.UI/Pages/WelcomePage.razor → ...yApp.UI/Pages/SignedOut/WelcomePage.razor b/BTCPayApp.UI/Pages/WelcomePage.razor → ...yApp.UI/Pages/SignedOut/WelcomePage.razor