diff --git a/.idea/.idea.HopFrame/.idea/workspace.xml b/.idea/.idea.HopFrame/.idea/workspace.xml
index a488f67..9b21c57 100644
--- a/.idea/.idea.HopFrame/.idea/workspace.xml
+++ b/.idea/.idea.HopFrame/.idea/workspace.xml
@@ -11,8 +11,15 @@
-
+
+
+
+
+
+
+
+
@@ -32,7 +39,7 @@
@@ -59,29 +66,33 @@
+
+
+
+
+
-
{}
{
@@ -100,28 +111,28 @@
- {
+ "keyToString": {
+ ".NET Launch Settings Profile.HopFrame.Testing.Api: https.executor": "Run",
+ ".NET Launch Settings Profile.HopFrame.Testing.executor": "Run",
+ ".NET Launch Settings Profile.HopFrame.Testing: https.executor": "Run",
+ ".NET Project.HopFrame.Testing.executor": "Run",
+ "72b118b0-a6fc-4561-acdf-74f0b454dbb8.executor": "Debug",
+ "RunOnceActivity.ShowReadmeOnStart": "true",
+ "RunOnceActivity.git.unshallow": "true",
+ "b5f11219-dfc4-47a1-b02c-90ab603034fb.executor": "Debug",
+ "dcdf1689-dc07-47e4-8824-2e60a4fbf301.executor": "Debug",
+ "git-widget-placeholder": "!29 on feature/custom-views",
+ "list.type.of.created.stylesheet": "CSS",
+ "node.js.detected.package.eslint": "true",
+ "node.js.detected.package.tslint": "true",
+ "node.js.selected.package.eslint": "(autodetect)",
+ "node.js.selected.package.tslint": "(autodetect)",
+ "nodejs_package_manager_path": "npm",
+ "settings.editor.selected.configurable": "preferences.environmentSetup",
+ "vue.rearranger.settings.migration": "true"
}
-}]]>
+}
@@ -220,7 +231,8 @@
-
+
+
@@ -494,7 +506,15 @@
1738407061976
-
+
+
+ 1738407710507
+
+
+
+ 1738407710507
+
+
@@ -545,7 +565,6 @@
-
@@ -570,6 +589,7 @@
-
+
+
\ No newline at end of file
diff --git a/src/HopFrame.Web/Components/HopFrameCard.razor b/src/HopFrame.Web/Components/HopFrameCard.razor
new file mode 100644
index 0000000..cfe6f93
--- /dev/null
+++ b/src/HopFrame.Web/Components/HopFrameCard.razor
@@ -0,0 +1,35 @@
+
+
+ @if (Icon is not null) {
+
+ }
+ @Title
+
+ @Subtitle
+ @Description
+
+
+
+
+@code {
+ [Parameter]
+ public required string Title { get; set; }
+
+ [Parameter]
+ public string? Subtitle { get; set; }
+
+ [Parameter]
+ public required string Description { get; set; }
+
+ [Parameter]
+ public required string Href { get; set; }
+
+ [Parameter]
+ public Icon? Icon { get; set; }
+}
\ No newline at end of file
diff --git a/src/HopFrame.Web/Components/Layout/HopFrameLayout.razor b/src/HopFrame.Web/Components/Layout/HopFrameLayout.razor
index c9d3fa4..5be0a6b 100644
--- a/src/HopFrame.Web/Components/Layout/HopFrameLayout.razor
+++ b/src/HopFrame.Web/Components/Layout/HopFrameLayout.razor
@@ -1,5 +1,6 @@
@using HopFrame.Core.Config
@using HopFrame.Core.Services
+@using HopFrame.Web.Models
@using Microsoft.Extensions.DependencyInjection
@inherits LayoutComponentBase
@@ -39,10 +40,28 @@
@code {
+ internal static readonly List CustomViews = new();
+
protected override async Task OnInitializedAsync() {
var authorized = await Handler.IsAuthenticatedAsync(Config.BasePolicy);
+
+ var currentUri = "/" + Navigator.ToBaseRelativePath(Navigator.Uri);
+
+ if (authorized) {
+ foreach (var view in CustomViews.Where(view => !string.IsNullOrWhiteSpace(view.Policy))) {
+ switch (view.LinkMatch) {
+ case NavLinkMatch.All when currentUri != view.Url:
+ case NavLinkMatch.Prefix when !currentUri.StartsWith(view.Url):
+ continue;
+ }
+
+ authorized = await Handler.IsAuthenticatedAsync(view.Policy);
+ break;
+ }
+ }
+
if (!authorized) {
- Navigator.NavigateTo((Config.LoginPageRewrite ?? "/login") + "?redirect=/" + Navigator.ToBaseRelativePath(Navigator.Uri), true);
+ Navigator.NavigateTo((Config.LoginPageRewrite ?? "/login") + "?redirect=" + currentUri, true);
}
}
diff --git a/src/HopFrame.Web/Components/Layout/HopFrameSideMenu.razor b/src/HopFrame.Web/Components/Layout/HopFrameSideMenu.razor
index d839091..4b052fc 100644
--- a/src/HopFrame.Web/Components/Layout/HopFrameSideMenu.razor
+++ b/src/HopFrame.Web/Components/Layout/HopFrameSideMenu.razor
@@ -1,5 +1,6 @@
@using HopFrame.Core.Config
@using HopFrame.Core.Services
+@using HopFrame.Web.Models
+ @foreach (var view in _views) {
+
+ }
+
@foreach (var table in _tables.OrderBy(t => t.Order).Select(t => t.DisplayName)) {
_tables = [];
+ private readonly List _views = [];
protected override async Task OnInitializedAsync() {
foreach (var table in Explorer.GetTables()) {
@@ -34,6 +45,21 @@
if (!await Handler.IsAuthenticatedAsync(table.ViewPolicy)) continue;
_tables.Add(table);
}
+
+ foreach (var view in HopFrameLayout.CustomViews) {
+ if (!await Handler.IsAuthenticatedAsync(view.Policy)) continue;
+ _views.Add(view);
+ }
+ }
+
+ internal static Icon GetLinkIcon(CustomView view, IconVariant variant) {
+ var info = new IconInfo {
+ Name = view.Icon,
+ Variant = variant,
+ Size = IconSize.Size24
+ };
+
+ return info.GetInstance();
}
}
diff --git a/src/HopFrame.Web/Components/Pages/HopFrameHome.razor b/src/HopFrame.Web/Components/Pages/HopFrameHome.razor
index 6be85aa..137858f 100644
--- a/src/HopFrame.Web/Components/Pages/HopFrameHome.razor
+++ b/src/HopFrame.Web/Components/Pages/HopFrameHome.razor
@@ -1,28 +1,31 @@
@page "/admin"
@using HopFrame.Core.Config
@using HopFrame.Core.Services
+@using HopFrame.Web.Models
@layout HopFrameLayout
HopFrame
-
Tables
+
Pages
+ @foreach (var view in _views) {
+
+ }
+
@foreach (var table in _tables.OrderBy(t => t.Order)) {
-
- @table.DisplayName
- @table.ViewPolicy
- @table.Description
-
-
-
+
}