Skip to content

Commit 30756e3

Browse files
nickprotopnickprotop
committed
Update Blazor UI for auth state and billing display improvements
1 parent 109a6f8 commit 30756e3

27 files changed

Lines changed: 96 additions & 86 deletions

‎cloud/src/LrmCloud.Web/Components/ImportProjectDialog.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@
532532
private void GoToProject(int projectId)
533533
{
534534
Close();
535-
Navigation.NavigateTo($"/app/projects/{projectId}");
535+
Navigation.NavigateTo($"projects/{projectId}");
536536
}
537537

538538
private static string GetFileIcon(string fileName) =>

‎cloud/src/LrmCloud.Web/Components/OrgSelector.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
}
4343

4444
<MudDivider />
45-
<MudMenuItem Href="/app/organizations" Icon="@Icons.Material.Filled.Settings">
45+
<MudMenuItem Href="organizations" Icon="@Icons.Material.Filled.Settings">
4646
Manage Organizations
4747
</MudMenuItem>
4848
</MudMenu>

‎cloud/src/LrmCloud.Web/Components/RedirectToLogin.razor‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
{
66
var returnUrl = Uri.EscapeDataString(Navigation.ToBaseRelativePath(Navigation.Uri));
77
var loginUrl = string.IsNullOrEmpty(returnUrl) || returnUrl == "/"
8-
? "/app/login"
9-
: $"/app/login?returnUrl={returnUrl}";
8+
? "login"
9+
: $"login?returnUrl={returnUrl}";
1010

1111
Navigation.NavigateTo(loginUrl, forceLoad: false);
1212
}

‎cloud/src/LrmCloud.Web/Components/TranslateDialog.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
@_usageWarning
165165
@if (_usageBlocked)
166166
{
167-
<MudLink Href="/app/settings" Class="ml-2">Upgrade Plan</MudLink>
167+
<MudLink Href="settings" Class="ml-2">Upgrade Plan</MudLink>
168168
}
169169
</MudAlert>
170170
}

‎cloud/src/LrmCloud.Web/Layout/MainLayout.razor‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<MudLayout>
1313
<MudAppBar Elevation="1" Dense="@_isMobile">
1414
<MudIconButton Icon="@Icons.Material.Filled.Menu" Color="Color.Inherit" Edge="Edge.Start" OnClick="@ToggleDrawer" />
15-
<MudLink Href="/app" Typo="Typo.h6" Color="Color.Inherit" Underline="Underline.None" Class="ml-3 d-none d-sm-flex">LRM Cloud</MudLink>
16-
<MudLink Href="/app" Typo="Typo.h6" Color="Color.Inherit" Underline="Underline.None" Class="ml-2 d-flex d-sm-none">LRM</MudLink>
15+
<MudLink Href="" Typo="Typo.h6" Color="Color.Inherit" Underline="Underline.None" Class="ml-3 d-none d-sm-flex">LRM Cloud</MudLink>
16+
<MudLink Href="" Typo="Typo.h6" Color="Color.Inherit" Underline="Underline.None" Class="ml-2 d-flex d-sm-none">LRM</MudLink>
1717
<MudDivider Vertical="true" FlexItem="true" Class="mx-2 d-none d-sm-flex" />
1818
<OrgSelector />
1919
<MudSpacer />
@@ -31,16 +31,16 @@
3131
<MudText Typo="Typo.body2" Color="Color.Secondary">@context.User.Identity?.Name</MudText>
3232
</MudMenuItem>
3333
<MudDivider />
34-
<MudMenuItem Href="/app/settings/profile" Icon="@Icons.Material.Filled.Person">Profile</MudMenuItem>
35-
<MudMenuItem Href="/app/settings/api-keys" Icon="@Icons.Material.Filled.Key">API Keys</MudMenuItem>
36-
<MudMenuItem Href="/app/settings/usage" Icon="@Icons.Material.Filled.Analytics">Usage</MudMenuItem>
37-
<MudMenuItem Href="/app/settings/billing" Icon="@Icons.Material.Filled.CreditCard">Billing</MudMenuItem>
34+
<MudMenuItem Href="settings/profile" Icon="@Icons.Material.Filled.Person">Profile</MudMenuItem>
35+
<MudMenuItem Href="settings/api-keys" Icon="@Icons.Material.Filled.Key">API Keys</MudMenuItem>
36+
<MudMenuItem Href="settings/usage" Icon="@Icons.Material.Filled.Analytics">Usage</MudMenuItem>
37+
<MudMenuItem Href="settings/billing" Icon="@Icons.Material.Filled.CreditCard">Billing</MudMenuItem>
3838
<MudDivider />
3939
<MudMenuItem OnClick="@Logout" Icon="@Icons.Material.Filled.Logout">Logout</MudMenuItem>
4040
</MudMenu>
4141
</Authorized>
4242
<NotAuthorized>
43-
<MudButton Variant="Variant.Text" Color="Color.Inherit" Href="/app/login" Size="@(_isMobile ? Size.Small : Size.Medium)">Login</MudButton>
43+
<MudButton Variant="Variant.Text" Color="Color.Inherit" Href="login" Size="@(_isMobile ? Size.Small : Size.Medium)">Login</MudButton>
4444
</NotAuthorized>
4545
</AuthorizeView>
4646
</MudAppBar>
@@ -117,6 +117,6 @@
117117
private async Task Logout()
118118
{
119119
await AuthService.LogoutAsync();
120-
Navigation.NavigateTo("/app/login", forceLoad: true);
120+
Navigation.NavigateTo("login", forceLoad: true);
121121
}
122122
}

‎cloud/src/LrmCloud.Web/Pages/Auth/ForgotPassword.razor‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<MudAlert Severity="Severity.Success" Dense="true">
1818
@_successMessage
1919
</MudAlert>
20-
<MudButton Variant="Variant.Text" Color="Color.Primary" Href="/app/login" FullWidth="true">
20+
<MudButton Variant="Variant.Text" Color="Color.Primary" Href="login" FullWidth="true">
2121
Back to Login
2222
</MudButton>
2323
}
@@ -57,7 +57,7 @@
5757
</EditForm>
5858

5959
<MudText Typo="Typo.body2" Align="Align.Center" Class="mt-4">
60-
Remember your password? <MudLink Href="/app/login">Sign in</MudLink>
60+
Remember your password? <MudLink Href="login">Sign in</MudLink>
6161
</MudText>
6262
}
6363
</MudStack>

‎cloud/src/LrmCloud.Web/Pages/Auth/Login.razor‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
UserAttributes="@(new Dictionary<string, object> { { "autocomplete", "current-password" } })" />
4242

4343
<MudStack Row="true" Justify="Justify.SpaceBetween" AlignItems="AlignItems.Center">
44-
<MudLink Href="/app/forgot-password" Typo="Typo.body2">Forgot password?</MudLink>
44+
<MudLink Href="forgot-password" Typo="Typo.body2">Forgot password?</MudLink>
4545
</MudStack>
4646

4747
<MudButton ButtonType="ButtonType.Submit"
@@ -77,7 +77,7 @@
7777
</MudButton>
7878

7979
<MudText Typo="Typo.body2" Align="Align.Center" Class="mt-4">
80-
Don't have an account? <MudLink Href="/app/register">Sign up</MudLink>
80+
Don't have an account? <MudLink Href="register">Sign up</MudLink>
8181
</MudText>
8282
</MudStack>
8383
</MudPaper>
@@ -97,7 +97,7 @@
9797
// If user is already authenticated, redirect to home or return URL
9898
if (await AuthService.IsAuthenticatedAsync())
9999
{
100-
Navigation.NavigateTo(ReturnUrl ?? "/app", forceLoad: false);
100+
Navigation.NavigateTo(ReturnUrl ?? "", forceLoad: false);
101101
}
102102
}
103103

@@ -114,7 +114,7 @@
114114
{
115115
// Use empty string to navigate to app root (relative to base href /app/)
116116
// forceLoad ensures auth state is refreshed
117-
Navigation.NavigateTo(ReturnUrl ?? "/app", forceLoad: true);
117+
Navigation.NavigateTo(ReturnUrl ?? "", forceLoad: true);
118118
}
119119
else
120120
{

‎cloud/src/LrmCloud.Web/Pages/Auth/Register.razor‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<MudAlert Severity="Severity.Success" Dense="true">
1919
@_successMessage
2020
<br />
21-
<MudLink Href="/app/login">Go to login</MudLink>
21+
<MudLink Href="login">Go to login</MudLink>
2222
</MudAlert>
2323
}
2424
else
@@ -102,7 +102,7 @@
102102
</MudButton>
103103

104104
<MudText Typo="Typo.body2" Align="Align.Center" Class="mt-4">
105-
Already have an account? <MudLink Href="/app/login">Sign in</MudLink>
105+
Already have an account? <MudLink Href="login">Sign in</MudLink>
106106
</MudText>
107107
}
108108
</MudStack>
@@ -121,7 +121,7 @@
121121
// If user is already authenticated, redirect to home
122122
if (await AuthService.IsAuthenticatedAsync())
123123
{
124-
Navigation.NavigateTo("/app", forceLoad: false);
124+
Navigation.NavigateTo("", forceLoad: false);
125125
}
126126
}
127127

‎cloud/src/LrmCloud.Web/Pages/Auth/ResetPassword.razor‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
<MudAlert Severity="Severity.Error" Dense="true">
1919
Invalid or missing reset token.
2020
<br />
21-
<MudLink Href="/app/forgot-password">Request a new reset link</MudLink>
21+
<MudLink Href="forgot-password">Request a new reset link</MudLink>
2222
</MudAlert>
2323
}
2424
else if (_successMessage != null)
2525
{
2626
<MudAlert Severity="Severity.Success" Dense="true">
2727
@_successMessage
2828
</MudAlert>
29-
<MudButton Variant="Variant.Filled" Color="Color.Primary" Href="/app/login" FullWidth="true">
29+
<MudButton Variant="Variant.Filled" Color="Color.Primary" Href="login" FullWidth="true">
3030
Go to Login
3131
</MudButton>
3232
}

‎cloud/src/LrmCloud.Web/Pages/Auth/VerifyEmail.razor‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<MudText Typo="Typo.body1" Color="Color.Secondary" Align="Align.Center">
1919
Your email has been verified successfully. You can now log in to your account.
2020
</MudText>
21-
<MudButton Variant="Variant.Filled" Color="Color.Primary" Href="/app/login" FullWidth="true">
21+
<MudButton Variant="Variant.Filled" Color="Color.Primary" Href="login" FullWidth="true">
2222
Go to Login
2323
</MudButton>
2424
}
@@ -29,7 +29,7 @@
2929
<MudText Typo="Typo.body1" Color="Color.Secondary" Align="Align.Center">
3030
@_errorMessage
3131
</MudText>
32-
<MudButton Variant="Variant.Outlined" Color="Color.Primary" Href="/app/login" FullWidth="true">
32+
<MudButton Variant="Variant.Outlined" Color="Color.Primary" Href="login" FullWidth="true">
3333
Go to Login
3434
</MudButton>
3535
}

0 commit comments

Comments
 (0)