Compare commits
6 Commits
075c0e69da
...
11de14d12e
| Author | SHA1 | Date | |
|---|---|---|---|
 Joseph Doherty
|
11de14d12e | ||
|
Joseph Doherty
|
aadbf49678 | ||
|
Joseph Doherty
|
70d764b063 | ||
|
Joseph Doherty
|
11bcff6af5 | ||
|
Joseph Doherty
|
de41963587 | ||
|
Joseph Doherty
|
a78b212c95 |
@@ -108,5 +108,6 @@
|
|||||||
<PackageVersion Include="ZB.MOM.WW.Auth.Ldap" Version="0.1.1" />
|
<PackageVersion Include="ZB.MOM.WW.Auth.Ldap" Version="0.1.1" />
|
||||||
<PackageVersion Include="ZB.MOM.WW.Auth.AspNetCore" Version="0.1.1" />
|
<PackageVersion Include="ZB.MOM.WW.Auth.AspNetCore" Version="0.1.1" />
|
||||||
<PackageVersion Include="ZB.MOM.WW.Audit" Version="0.1.0" />
|
<PackageVersion Include="ZB.MOM.WW.Audit" Version="0.1.0" />
|
||||||
|
<PackageVersion Include="ZB.MOM.WW.Theme" Version="0.2.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
@@ -22,6 +22,7 @@
|
|||||||
<package pattern="ZB.MOM.WW.Auth" />
|
<package pattern="ZB.MOM.WW.Auth" />
|
||||||
<package pattern="ZB.MOM.WW.Auth.*" />
|
<package pattern="ZB.MOM.WW.Auth.*" />
|
||||||
<package pattern="ZB.MOM.WW.Audit" />
|
<package pattern="ZB.MOM.WW.Audit" />
|
||||||
|
<package pattern="ZB.MOM.WW.Theme" />
|
||||||
</packageSource>
|
</packageSource>
|
||||||
</packageSourceMapping>
|
</packageSourceMapping>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
|||||||
@@ -14,14 +14,14 @@
|
|||||||
<title>OtOpcUa Admin</title>
|
<title>OtOpcUa Admin</title>
|
||||||
<base href="/"/>
|
<base href="/"/>
|
||||||
<link rel="stylesheet" href="_content/ZB.MOM.WW.OtOpcUa.AdminUI/lib/bootstrap/css/bootstrap.min.css"/>
|
<link rel="stylesheet" href="_content/ZB.MOM.WW.OtOpcUa.AdminUI/lib/bootstrap/css/bootstrap.min.css"/>
|
||||||
<link rel="stylesheet" href="_content/ZB.MOM.WW.OtOpcUa.AdminUI/css/theme.css"/>
|
<ThemeHead />
|
||||||
<link rel="stylesheet" href="_content/ZB.MOM.WW.OtOpcUa.AdminUI/css/site.css"/>
|
<link rel="stylesheet" href="_content/ZB.MOM.WW.OtOpcUa.AdminUI/css/site.css"/>
|
||||||
<HeadOutlet/>
|
<HeadOutlet/>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<Routes/>
|
<Routes/>
|
||||||
<script src="_content/ZB.MOM.WW.OtOpcUa.AdminUI/lib/bootstrap/js/bootstrap.bundle.min.js"></script>
|
<script src="_content/ZB.MOM.WW.OtOpcUa.AdminUI/lib/bootstrap/js/bootstrap.bundle.min.js"></script>
|
||||||
<script src="_content/ZB.MOM.WW.OtOpcUa.AdminUI/js/nav-state.js"></script>
|
<ThemeScripts />
|
||||||
<script src="_framework/blazor.web.js"></script>
|
<script src="_framework/blazor.web.js"></script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
@@ -1,28 +1,55 @@
|
|||||||
@inherits LayoutComponentBase
|
@inherits LayoutComponentBase
|
||||||
|
@using System.Security.Claims
|
||||||
|
|
||||||
@* Layout chrome ported from ScadaLink CentralUI: no separate top bar — brand sits
|
@* Thin delegation to the shared ZB.MOM.WW.Theme side-rail chassis. ThemeShell owns
|
||||||
at the top of the side rail. The sidebar itself is the interactive island
|
the brand bar, the CSS-only narrow-viewport hamburger, and the responsive collapse,
|
||||||
(<NavSidebar/>); MainLayout stays statically rendered so the Body RenderFragment
|
so MainLayout no longer carries its own .app-shell / hamburger wrapper. Nav sections
|
||||||
doesn't have to cross an interactive boundary. *@
|
are static <details> (NavRailSection) whose expand state is persisted to localStorage
|
||||||
|
by the kit's <ThemeScripts/> (emitted in App.razor) — replacing the old interactive
|
||||||
|
NavSidebar island + cookie/URL auto-expand. *@
|
||||||
|
|
||||||
<div class="app-shell d-flex flex-column flex-lg-row">
|
<ThemeShell Product="OtOpcUa" Accent="#2f5fd0">
|
||||||
@* Hamburger toggle: visible only on viewports <lg.
|
<Nav>
|
||||||
Bootstrap collapse JS lives in bootstrap.bundle.min.js (loaded in App.razor). *@
|
<NavRailSection Title="Navigation" Key="nav">
|
||||||
<button class="btn btn-outline-secondary btn-sm d-lg-none m-2 align-self-start"
|
<NavRailItem Href="/" Text="Overview" Match="NavLinkMatch.All" />
|
||||||
type="button"
|
<NavRailItem Href="/fleet" Text="Fleet status" />
|
||||||
data-bs-toggle="collapse"
|
<NavRailItem Href="/hosts" Text="Host status" />
|
||||||
data-bs-target="#sidebar-collapse"
|
<NavRailItem Href="/clusters" Text="Clusters" />
|
||||||
aria-controls="sidebar-collapse"
|
<NavRailItem Href="/reservations" Text="Reservations" />
|
||||||
aria-expanded="false"
|
<NavRailItem Href="/certificates" Text="Certificates" />
|
||||||
aria-label="Toggle navigation">
|
<NavRailItem Href="/role-grants" Text="Role grants" />
|
||||||
☰
|
</NavRailSection>
|
||||||
</button>
|
<NavRailSection Title="Scripting" Key="scripting">
|
||||||
|
<NavRailItem Href="/virtual-tags" Text="Virtual tags" />
|
||||||
<div class="collapse d-lg-block" id="sidebar-collapse">
|
<NavRailItem Href="/scripted-alarms" Text="Scripted alarms" />
|
||||||
<NavSidebar />
|
<NavRailItem Href="/scripts" Text="Scripts" />
|
||||||
</div>
|
<NavRailItem Href="/script-log" Text="Script log" />
|
||||||
|
</NavRailSection>
|
||||||
<main class="page">
|
<NavRailSection Title="Live" Key="live">
|
||||||
@Body
|
<NavRailItem Href="/deployments" Text="Deployments" />
|
||||||
</main>
|
<NavRailItem Href="/alerts" Text="Alerts" />
|
||||||
</div>
|
<NavRailItem Href="/alarms-historian" Text="Alarms historian" />
|
||||||
|
</NavRailSection>
|
||||||
|
</Nav>
|
||||||
|
<RailFooter>
|
||||||
|
<AuthorizeView>
|
||||||
|
<Authorized>
|
||||||
|
<div class="rail-eyebrow">Session</div>
|
||||||
|
<a class="rail-user" href="/account">@context.User.Identity?.Name</a>
|
||||||
|
<div class="rail-roles">
|
||||||
|
@string.Join(", ", context.User.Claims
|
||||||
|
.Where(c => c.Type == ClaimTypes.Role).Select(c => c.Value))
|
||||||
|
</div>
|
||||||
|
<form method="post" action="/auth/logout">
|
||||||
|
<AntiforgeryToken />
|
||||||
|
<button class="rail-btn" type="submit">Sign out</button>
|
||||||
|
</form>
|
||||||
|
</Authorized>
|
||||||
|
<NotAuthorized>
|
||||||
|
<div class="rail-eyebrow">Session</div>
|
||||||
|
<a class="rail-btn" href="/login">Sign in</a>
|
||||||
|
</NotAuthorized>
|
||||||
|
</AuthorizeView>
|
||||||
|
</RailFooter>
|
||||||
|
<ChildContent>@Body</ChildContent>
|
||||||
|
</ThemeShell>
|
||||||
|
|||||||
@@ -1,36 +0,0 @@
|
|||||||
@* A collapsible sidebar nav section: an uppercase-eyebrow button that toggles
|
|
||||||
the visibility of its child nav items. Mirrors the ScadaLink NavSection at
|
|
||||||
/Users/dohertj2/Desktop/scadalink-design/src/ScadaLink.CentralUI/Components/Layout/NavSection.razor
|
|
||||||
but uses OtOpcUa's rail-eyebrow + rail-link classes. *@
|
|
||||||
|
|
||||||
<button type="button"
|
|
||||||
class="rail-eyebrow-toggle"
|
|
||||||
@onclick="OnToggle"
|
|
||||||
aria-expanded="@(Expanded ? "true" : "false")">
|
|
||||||
<span class="rail-eyebrow-chevron">@(Expanded ? "▼" : "▶")</span>
|
|
||||||
<span class="rail-eyebrow-label">@Title</span>
|
|
||||||
</button>
|
|
||||||
@if (Expanded)
|
|
||||||
{
|
|
||||||
<div class="rail-section-body">
|
|
||||||
@ChildContent
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
|
|
||||||
@code {
|
|
||||||
/// <summary>Section label shown in the eyebrow (e.g. "Scripting").</summary>
|
|
||||||
[Parameter, EditorRequired]
|
|
||||||
public string Title { get; set; } = string.Empty;
|
|
||||||
|
|
||||||
/// <summary>Whether the section is expanded — its child links rendered.</summary>
|
|
||||||
[Parameter]
|
|
||||||
public bool Expanded { get; set; }
|
|
||||||
|
|
||||||
/// <summary>Raised when the eyebrow button is clicked.</summary>
|
|
||||||
[Parameter]
|
|
||||||
public EventCallback OnToggle { get; set; }
|
|
||||||
|
|
||||||
/// <summary>The section's child nav links, rendered only while expanded.</summary>
|
|
||||||
[Parameter]
|
|
||||||
public RenderFragment? ChildContent { get; set; }
|
|
||||||
}
|
|
||||||
@@ -1,160 +0,0 @@
|
|||||||
@rendermode InteractiveServer
|
|
||||||
@using Microsoft.AspNetCore.Components.Routing
|
|
||||||
@using Microsoft.JSInterop
|
|
||||||
@implements IDisposable
|
|
||||||
@inject NavigationManager Navigation
|
|
||||||
@inject IJSRuntime JS
|
|
||||||
|
|
||||||
@* Interactive sidebar — extracted from MainLayout so the layout itself can stay
|
|
||||||
statically rendered (layouts can't take RenderFragment Body across an interactive
|
|
||||||
boundary). Hosts the collapsible NavSection groups and cookie persistence. *@
|
|
||||||
|
|
||||||
<nav class="side-rail">
|
|
||||||
<div class="brand"><span class="mark">▮</span> OtOpcUa</div>
|
|
||||||
|
|
||||||
<NavSection Title="Navigation"
|
|
||||||
Expanded="@_expanded.Contains("nav")"
|
|
||||||
OnToggle="@(() => ToggleAsync("nav"))">
|
|
||||||
<NavLink class="rail-link" href="/" Match="NavLinkMatch.All">Overview</NavLink>
|
|
||||||
<NavLink class="rail-link" href="/fleet" Match="NavLinkMatch.Prefix">Fleet status</NavLink>
|
|
||||||
<NavLink class="rail-link" href="/hosts" Match="NavLinkMatch.Prefix">Host status</NavLink>
|
|
||||||
<NavLink class="rail-link" href="/clusters" Match="NavLinkMatch.Prefix">Clusters</NavLink>
|
|
||||||
<NavLink class="rail-link" href="/reservations" Match="NavLinkMatch.Prefix">Reservations</NavLink>
|
|
||||||
<NavLink class="rail-link" href="/certificates" Match="NavLinkMatch.Prefix">Certificates</NavLink>
|
|
||||||
<NavLink class="rail-link" href="/role-grants" Match="NavLinkMatch.Prefix">Role grants</NavLink>
|
|
||||||
</NavSection>
|
|
||||||
|
|
||||||
<NavSection Title="Scripting"
|
|
||||||
Expanded="@_expanded.Contains("scripting")"
|
|
||||||
OnToggle="@(() => ToggleAsync("scripting"))">
|
|
||||||
<NavLink class="rail-link" href="/virtual-tags" Match="NavLinkMatch.Prefix">Virtual tags</NavLink>
|
|
||||||
<NavLink class="rail-link" href="/scripted-alarms" Match="NavLinkMatch.Prefix">Scripted alarms</NavLink>
|
|
||||||
<NavLink class="rail-link" href="/scripts" Match="NavLinkMatch.Prefix">Scripts</NavLink>
|
|
||||||
<NavLink class="rail-link" href="/script-log" Match="NavLinkMatch.Prefix">Script log</NavLink>
|
|
||||||
</NavSection>
|
|
||||||
|
|
||||||
<NavSection Title="Live"
|
|
||||||
Expanded="@_expanded.Contains("live")"
|
|
||||||
OnToggle="@(() => ToggleAsync("live"))">
|
|
||||||
<NavLink class="rail-link" href="/deployments" Match="NavLinkMatch.Prefix">Deployments</NavLink>
|
|
||||||
<NavLink class="rail-link" href="/alerts" Match="NavLinkMatch.Prefix">Alerts</NavLink>
|
|
||||||
<NavLink class="rail-link" href="/alarms-historian" Match="NavLinkMatch.Prefix">Alarms historian</NavLink>
|
|
||||||
</NavSection>
|
|
||||||
|
|
||||||
<div class="rail-foot">
|
|
||||||
<AuthorizeView>
|
|
||||||
<Authorized>
|
|
||||||
<div class="rail-eyebrow">Session</div>
|
|
||||||
<a class="rail-user" href="/account">@context.User.Identity?.Name</a>
|
|
||||||
<div class="rail-roles">
|
|
||||||
@string.Join(", ", context.User.Claims
|
|
||||||
.Where(c => c.Type.EndsWith("/role")).Select(c => c.Value))
|
|
||||||
</div>
|
|
||||||
<form method="post" action="/auth/logout">
|
|
||||||
<AntiforgeryToken />
|
|
||||||
<button class="rail-btn" type="submit">Sign out</button>
|
|
||||||
</form>
|
|
||||||
</Authorized>
|
|
||||||
<NotAuthorized>
|
|
||||||
<div class="rail-eyebrow">Session</div>
|
|
||||||
<a class="rail-btn" href="/login">Sign in</a>
|
|
||||||
</NotAuthorized>
|
|
||||||
</AuthorizeView>
|
|
||||||
</div>
|
|
||||||
</nav>
|
|
||||||
|
|
||||||
@code {
|
|
||||||
// Expanded-section state persists in the `otopcua_nav` cookie via
|
|
||||||
// wwwroot/js/nav-state.js (window.navState.get/.set). Same pattern as
|
|
||||||
// ScadaLink CentralUI's NavMenu.
|
|
||||||
|
|
||||||
private static readonly string[] SectionIds = { "nav", "scripting", "live" };
|
|
||||||
|
|
||||||
private readonly HashSet<string> _expanded = new(StringComparer.Ordinal);
|
|
||||||
|
|
||||||
protected override void OnInitialized()
|
|
||||||
{
|
|
||||||
Navigation.LocationChanged += OnLocationChanged;
|
|
||||||
// Seed from the URL so the current page's section is expanded on the
|
|
||||||
// initial render — works even before JS interop is ready.
|
|
||||||
EnsureCurrentSectionExpanded();
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override async Task OnAfterRenderAsync(bool firstRender)
|
|
||||||
{
|
|
||||||
if (!firstRender) return;
|
|
||||||
|
|
||||||
string saved;
|
|
||||||
try
|
|
||||||
{
|
|
||||||
saved = await JS.InvokeAsync<string>("navState.get") ?? string.Empty;
|
|
||||||
}
|
|
||||||
catch (JSDisconnectedException) { return; }
|
|
||||||
catch (InvalidOperationException) { return; }
|
|
||||||
|
|
||||||
foreach (var id in saved.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries))
|
|
||||||
{
|
|
||||||
if (Array.IndexOf(SectionIds, id) >= 0)
|
|
||||||
_expanded.Add(id);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (EnsureCurrentSectionExpanded())
|
|
||||||
await PersistAsync();
|
|
||||||
|
|
||||||
StateHasChanged();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void OnLocationChanged(object? sender, LocationChangedEventArgs e)
|
|
||||||
{
|
|
||||||
if (EnsureCurrentSectionExpanded())
|
|
||||||
{
|
|
||||||
_ = PersistAsync();
|
|
||||||
_ = InvokeAsync(StateHasChanged);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task ToggleAsync(string id)
|
|
||||||
{
|
|
||||||
if (!_expanded.Remove(id))
|
|
||||||
_expanded.Add(id);
|
|
||||||
await PersistAsync();
|
|
||||||
}
|
|
||||||
|
|
||||||
private bool EnsureCurrentSectionExpanded()
|
|
||||||
{
|
|
||||||
var section = CurrentSection();
|
|
||||||
return section is not null && _expanded.Add(section);
|
|
||||||
}
|
|
||||||
|
|
||||||
private string? CurrentSection()
|
|
||||||
{
|
|
||||||
var relative = Navigation.ToBaseRelativePath(Navigation.Uri);
|
|
||||||
var firstSegment = relative.Split('?', '#')[0]
|
|
||||||
.Split('/', StringSplitOptions.RemoveEmptyEntries)
|
|
||||||
.FirstOrDefault();
|
|
||||||
|
|
||||||
return firstSegment switch
|
|
||||||
{
|
|
||||||
null or "" => "nav",
|
|
||||||
"fleet" or "hosts" or "clusters" or "reservations" or "certificates" or "role-grants" => "nav",
|
|
||||||
"virtual-tags" or "scripted-alarms" or "scripts" or "script-log" => "scripting",
|
|
||||||
"deployments" or "alerts" or "alarms-historian" => "live",
|
|
||||||
_ => null,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task PersistAsync()
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
await JS.InvokeVoidAsync("navState.set", string.Join(',', _expanded));
|
|
||||||
}
|
|
||||||
catch (JSDisconnectedException) { }
|
|
||||||
catch (InvalidOperationException) { }
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Dispose()
|
|
||||||
{
|
|
||||||
Navigation.LocationChanged -= OnLocationChanged;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -5,39 +5,14 @@
|
|||||||
the form POSTs to /auth/login while ASP.NET still owns an unstarted HTTP response.
|
the form POSTs to /auth/login while ASP.NET still owns an unstarted HTTP response.
|
||||||
Calling SignInAsync from an interactive circuit would be too late.
|
Calling SignInAsync from an interactive circuit would be too late.
|
||||||
|
|
||||||
Uses LoginLayout (no side rail) so the page renders as a clean centred card. *@
|
Uses LoginLayout (no side rail) so the page renders as a clean centred card.
|
||||||
|
The card itself is the shared kit's <LoginCard> — it owns the .login-wrap centring
|
||||||
|
wrapper, the .panel shell, and the static form-POST (username/password/returnUrl). *@
|
||||||
@attribute [Microsoft.AspNetCore.Authorization.AllowAnonymous]
|
@attribute [Microsoft.AspNetCore.Authorization.AllowAnonymous]
|
||||||
|
|
||||||
<div class="login-wrap rise" style="animation-delay:.02s">
|
<LoginCard Product="OtOpcUa Admin" Action="/auth/login" ReturnUrl="@ReturnUrl" Error="@Error">
|
||||||
<section class="panel">
|
<AntiforgeryToken />
|
||||||
<div style="padding:1.4rem 1.1rem 1.25rem">
|
</LoginCard>
|
||||||
<h1 class="login-title">OtOpcUa Admin — sign in</h1>
|
|
||||||
<form method="post" action="/auth/login" data-enhance="false">
|
|
||||||
@if (ReturnUrl is not null)
|
|
||||||
{
|
|
||||||
<input type="hidden" name="returnUrl" value="@ReturnUrl"/>
|
|
||||||
}
|
|
||||||
<div class="mb-3">
|
|
||||||
<label class="form-label" for="username">Username</label>
|
|
||||||
<input id="username" name="username" type="text"
|
|
||||||
class="form-control form-control-sm" autocomplete="username"/>
|
|
||||||
</div>
|
|
||||||
<div class="mb-3">
|
|
||||||
<label class="form-label" for="password">Password</label>
|
|
||||||
<input id="password" name="password" type="password"
|
|
||||||
class="form-control form-control-sm" autocomplete="current-password"/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
@if (!string.IsNullOrWhiteSpace(Error))
|
|
||||||
{
|
|
||||||
<div class="panel notice" style="margin-bottom:.85rem">@Error</div>
|
|
||||||
}
|
|
||||||
|
|
||||||
<button class="btn btn-primary w-100" type="submit">Sign in</button>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
@code {
|
@code {
|
||||||
/// <summary>Error message surfaced by /auth/login after a failed bind.</summary>
|
/// <summary>Error message surfaced by /auth/login after a failed bind.</summary>
|
||||||
|
|||||||
@@ -1,7 +0,0 @@
|
|||||||
@* Status chip — wraps the theme.css .chip / .chip-ok / .chip-warn / .chip-bad / .chip-idle classes. *@
|
|
||||||
<span class="chip @CssClass">@Text</span>
|
|
||||||
|
|
||||||
@code {
|
|
||||||
[Parameter] public string Text { get; set; } = "";
|
|
||||||
[Parameter] public string CssClass { get; set; } = "chip-idle";
|
|
||||||
}
|
|
||||||
@@ -9,6 +9,7 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<FrameworkReference Include="Microsoft.AspNetCore.App"/>
|
<FrameworkReference Include="Microsoft.AspNetCore.App"/>
|
||||||
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client"/>
|
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client"/>
|
||||||
|
<PackageReference Include="ZB.MOM.WW.Theme"/>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -7,3 +7,4 @@
|
|||||||
@using Microsoft.JSInterop
|
@using Microsoft.JSInterop
|
||||||
@using ZB.MOM.WW.OtOpcUa.AdminUI.Components.Shared
|
@using ZB.MOM.WW.OtOpcUa.AdminUI.Components.Shared
|
||||||
@using ZB.MOM.WW.OtOpcUa.AdminUI.Components.Layout
|
@using ZB.MOM.WW.OtOpcUa.AdminUI.Components.Layout
|
||||||
|
@using ZB.MOM.WW.Theme
|
||||||
|
|||||||
@@ -172,3 +172,13 @@
|
|||||||
max-width: 380px;
|
max-width: 380px;
|
||||||
margin: 3.5rem auto 0;
|
margin: 3.5rem auto 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* --- App-specific rules not provided by ZB.MOM.WW.Theme (migrated during theme adoption) --- */
|
||||||
|
/* OtOpcUa domain pages (Alerts, ScriptLog, Fleet, Hosts, AlarmsHistorian,
|
||||||
|
RoleGrants, ImportEquipment) use two extra status-chip variants on top of the
|
||||||
|
kit's .chip base + .chip-ok/.chip-warn/.chip-bad/.chip-idle/.chip-info set.
|
||||||
|
.chip-alert is the red/danger variant (mirrors the kit's .chip-bad);
|
||||||
|
.chip-caution is the amber variant (mirrors the kit's .chip-warn). Both reuse
|
||||||
|
the kit's status tokens so they stay on-palette. */
|
||||||
|
.chip-alert { color: var(--bad); background: var(--bad-bg); border-color: var(--bad-border); }
|
||||||
|
.chip-caution { color: var(--warn-ink); background: var(--warn-bg); border-color: var(--warn-border); }
|
||||||
|
|||||||
@@ -1,379 +0,0 @@
|
|||||||
/* ============================================================================
|
|
||||||
Technical-Light design system — portable theme layer
|
|
||||||
----------------------------------------------------------------------------
|
|
||||||
A refined technical-light aesthetic: warm-neutral paper, hairline rules,
|
|
||||||
IBM Plex type, monospace tabular numerics, status carried by colour. Built
|
|
||||||
to layer over Bootstrap 5 via --bs-* overrides, but every rule below works
|
|
||||||
standalone — Bootstrap is optional.
|
|
||||||
|
|
||||||
HOW TO ADOPT
|
|
||||||
1. Serve the three IBM Plex woff2 files (shipped in fonts/) and fix the
|
|
||||||
@font-face url() paths below to wherever you serve them.
|
|
||||||
2. Include this file once, globally. Add view-specific rules in a separate
|
|
||||||
stylesheet — never edit the token block per-view.
|
|
||||||
3. Status is colour, not iconography. Use the .s-* / .chip-* / .kv .v.*
|
|
||||||
helpers; do not hand-pick hex values in feature CSS.
|
|
||||||
========================================================================= */
|
|
||||||
|
|
||||||
/* ── Vendored fonts (embedded woff2, no network/CDN fetch) ───────────────────
|
|
||||||
Adjust these url()s to your asset route. If you cannot vendor the fonts the
|
|
||||||
--sans / --mono fallback stacks below degrade gracefully to system fonts. */
|
|
||||||
@font-face {
|
|
||||||
font-family: 'IBM Plex Sans';
|
|
||||||
font-style: normal; font-weight: 400; font-display: swap;
|
|
||||||
src: url('fonts/ibm-plex-sans-400.woff2') format('woff2');
|
|
||||||
}
|
|
||||||
@font-face {
|
|
||||||
font-family: 'IBM Plex Sans';
|
|
||||||
font-style: normal; font-weight: 600; font-display: swap;
|
|
||||||
src: url('fonts/ibm-plex-sans-600.woff2') format('woff2');
|
|
||||||
}
|
|
||||||
@font-face {
|
|
||||||
font-family: 'IBM Plex Mono';
|
|
||||||
font-style: normal; font-weight: 500; font-display: swap;
|
|
||||||
src: url('fonts/ibm-plex-mono-500.woff2') format('woff2');
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ── Design tokens ───────────────────────────────────────────────────────────
|
|
||||||
The single source of truth. Re-theme by editing only this block. */
|
|
||||||
:root {
|
|
||||||
/* Surfaces & ink */
|
|
||||||
--paper: #f4f4f1; /* page background — warm off-white, never pure */
|
|
||||||
--card: #ffffff; /* raised surfaces: cards, bars, table heads */
|
|
||||||
--ink: #1b1d21; /* primary text */
|
|
||||||
--ink-soft: #5a6066; /* secondary text, labels */
|
|
||||||
--ink-faint: #8b9097; /* tertiary text, captions, units */
|
|
||||||
--rule: #e4e4df; /* hairline borders / row dividers */
|
|
||||||
--rule-strong: #d2d2cb; /* emphasised hairlines: bar underline, pills */
|
|
||||||
|
|
||||||
/* Accent */
|
|
||||||
--accent: #2f5fd0; /* links, sort arrows, primary actions */
|
|
||||||
--accent-deep: #1e3f99; /* hover / pressed accent, raw-value emphasis */
|
|
||||||
|
|
||||||
/* Status — foreground */
|
|
||||||
--ok: #2f9e44;
|
|
||||||
--warn: #e8920c;
|
|
||||||
--bad: #e03131;
|
|
||||||
--idle: #868e96;
|
|
||||||
|
|
||||||
/* Status — tinted backgrounds (pair with the matching foreground) */
|
|
||||||
--ok-bg: #e9f6ec;
|
|
||||||
--warn-bg: #fdf1dd;
|
|
||||||
--bad-bg: #fceaea;
|
|
||||||
--idle-bg: #eef0f2;
|
|
||||||
|
|
||||||
/* Type stacks — Plex first, graceful system fallback */
|
|
||||||
--mono: 'IBM Plex Mono', ui-monospace, 'Cascadia Mono', Consolas, monospace;
|
|
||||||
--sans: 'IBM Plex Sans', system-ui, -apple-system, 'Segoe UI', sans-serif;
|
|
||||||
|
|
||||||
/* Bootstrap 5 overrides — harmless if Bootstrap is absent */
|
|
||||||
--bs-body-bg: var(--paper);
|
|
||||||
--bs-body-color: var(--ink);
|
|
||||||
--bs-body-font-family: var(--sans);
|
|
||||||
--bs-body-font-size: 0.9rem;
|
|
||||||
--bs-primary: var(--accent);
|
|
||||||
--bs-border-color: var(--rule);
|
|
||||||
--bs-emphasis-color: var(--ink);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ── Base ────────────────────────────────────────────────────────────────────
|
|
||||||
The faint top-right radial is the one deliberate flourish — a soft sheen,
|
|
||||||
not a gradient wash. Keep it subtle. */
|
|
||||||
body {
|
|
||||||
background:
|
|
||||||
radial-gradient(1200px 480px at 88% -8%, #ffffff 0%, rgba(255,255,255,0) 70%),
|
|
||||||
var(--paper);
|
|
||||||
color: var(--ink);
|
|
||||||
font-family: var(--sans);
|
|
||||||
font-size: 0.9rem;
|
|
||||||
-webkit-font-smoothing: antialiased;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Any numeric / fixed-width text. Tabular figures so columns of digits align. */
|
|
||||||
.numeric,
|
|
||||||
.mono { font-family: var(--mono); font-variant-numeric: tabular-nums; }
|
|
||||||
|
|
||||||
a { color: var(--accent); text-decoration: none; }
|
|
||||||
a:hover { color: var(--accent-deep); text-decoration: underline; }
|
|
||||||
|
|
||||||
/* ── App chrome: top bar ─────────────────────────────────────────────────────
|
|
||||||
One bar across the top: brand, breadcrumb crumbs, a flex spacer, then meta
|
|
||||||
text and any status pill pushed hard right. */
|
|
||||||
.app-bar {
|
|
||||||
display: flex;
|
|
||||||
align-items: baseline;
|
|
||||||
gap: 1rem;
|
|
||||||
padding: 0.85rem 1.25rem;
|
|
||||||
background: var(--card);
|
|
||||||
border-bottom: 1px solid var(--rule-strong);
|
|
||||||
}
|
|
||||||
.app-bar .brand {
|
|
||||||
font-weight: 600;
|
|
||||||
font-size: 1.05rem;
|
|
||||||
letter-spacing: 0.02em;
|
|
||||||
}
|
|
||||||
.app-bar .brand .mark { color: var(--accent); } /* the one accent glyph */
|
|
||||||
.app-bar .crumb { color: var(--ink-faint); font-size: 0.85rem; }
|
|
||||||
.app-bar .spacer { flex: 1; } /* pushes meta/pill right */
|
|
||||||
.app-bar .meta {
|
|
||||||
font-family: var(--mono);
|
|
||||||
font-size: 0.78rem;
|
|
||||||
color: var(--ink-soft);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ── Connection / liveness pill ──────────────────────────────────────────────
|
|
||||||
A rounded pill with a dot, driven entirely by data-state. Use for any
|
|
||||||
live-link health indicator (websocket, SSE, polling). */
|
|
||||||
.conn-pill {
|
|
||||||
display: inline-flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 0.4rem;
|
|
||||||
font-size: 0.74rem;
|
|
||||||
font-weight: 600;
|
|
||||||
text-transform: uppercase;
|
|
||||||
letter-spacing: 0.06em;
|
|
||||||
padding: 0.2rem 0.6rem;
|
|
||||||
border-radius: 999px;
|
|
||||||
border: 1px solid var(--rule-strong);
|
|
||||||
color: var(--ink-soft);
|
|
||||||
background: var(--card);
|
|
||||||
}
|
|
||||||
.conn-pill .dot {
|
|
||||||
width: 7px; height: 7px; border-radius: 50%;
|
|
||||||
background: var(--idle);
|
|
||||||
}
|
|
||||||
.conn-pill[data-state="connected"] { color: var(--ok); border-color: #bfe3c6; background: var(--ok-bg); }
|
|
||||||
.conn-pill[data-state="connected"] .dot { background: var(--ok); }
|
|
||||||
.conn-pill[data-state="connecting"] { color: var(--warn); border-color: #f0d9ab; background: var(--warn-bg); }
|
|
||||||
.conn-pill[data-state="connecting"] .dot { background: var(--warn); animation: pulse 1.1s ease-in-out infinite; }
|
|
||||||
.conn-pill[data-state="disconnected"] { color: var(--bad); border-color: #f0c0c0; background: var(--bad-bg); }
|
|
||||||
.conn-pill[data-state="disconnected"] .dot { background: var(--bad); }
|
|
||||||
|
|
||||||
@keyframes pulse { 0%,100% { opacity: 1; } 50% { opacity: 0.25; } }
|
|
||||||
|
|
||||||
/* ── Status text helpers ─────────────────────────────────────────────────────
|
|
||||||
Recolour a value in place — counts, ratios, error totals. */
|
|
||||||
.s-ok { color: var(--ok); }
|
|
||||||
.s-warn { color: var(--warn); }
|
|
||||||
.s-bad { color: var(--bad); }
|
|
||||||
.s-idle { color: var(--idle); }
|
|
||||||
|
|
||||||
/* ── State chip ──────────────────────────────────────────────────────────────
|
|
||||||
Compact rectangular badge for an enumerated state (bound/recovering/…).
|
|
||||||
Squarer than the pill; use the pill for liveness, the chip for state. */
|
|
||||||
.chip {
|
|
||||||
display: inline-block;
|
|
||||||
font-size: 0.72rem;
|
|
||||||
font-weight: 600;
|
|
||||||
text-transform: uppercase;
|
|
||||||
letter-spacing: 0.05em;
|
|
||||||
padding: 0.15rem 0.5rem;
|
|
||||||
border-radius: 4px;
|
|
||||||
border: 1px solid transparent;
|
|
||||||
}
|
|
||||||
.chip-ok { color: var(--ok); background: var(--ok-bg); border-color: #c6e6cd; }
|
|
||||||
.chip-warn { color: #b56a00; background: var(--warn-bg); border-color: #efd6a6; }
|
|
||||||
.chip-bad { color: var(--bad); background: var(--bad-bg); border-color: #eec3c3; }
|
|
||||||
.chip-idle { color: var(--ink-soft); background: var(--idle-bg); border-color: var(--rule-strong); }
|
|
||||||
|
|
||||||
/* ── Panel — the base raised surface ─────────────────────────────────────────
|
|
||||||
A white card with a hairline border and 8px radius. .panel-head is the
|
|
||||||
uppercase eyebrow label that sits on top. */
|
|
||||||
.panel {
|
|
||||||
background: var(--card);
|
|
||||||
border: 1px solid var(--rule);
|
|
||||||
border-radius: 8px;
|
|
||||||
}
|
|
||||||
.panel-head {
|
|
||||||
font-size: 0.74rem;
|
|
||||||
font-weight: 600;
|
|
||||||
text-transform: uppercase;
|
|
||||||
letter-spacing: 0.07em;
|
|
||||||
color: var(--ink-faint);
|
|
||||||
padding: 0.6rem 0.9rem;
|
|
||||||
border-bottom: 1px solid var(--rule);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ── Page wrapper ────────────────────────────────────────────────────────────
|
|
||||||
Centred, capped width, even gutter. */
|
|
||||||
.page { padding: 1.25rem; max-width: 1680px; margin: 0 auto; }
|
|
||||||
|
|
||||||
/* ── Reveal-on-paint ─────────────────────────────────────────────────────────
|
|
||||||
Add .rise to top-level sections; stagger with inline animation-delay
|
|
||||||
(.02s, .08s, .14s …) so panels settle in sequence, not all at once. */
|
|
||||||
@keyframes rise { from { opacity: 0; transform: translateY(6px); } to { opacity: 1; transform: none; } }
|
|
||||||
.rise { animation: rise 0.4s ease both; }
|
|
||||||
|
|
||||||
/* ════════════════════════════════════════════════════════════════════════════
|
|
||||||
COMPONENT LIBRARY
|
|
||||||
Generic, reusable pieces. View-specific layout belongs in a separate sheet.
|
|
||||||
════════════════════════════════════════════════════════════════════════════ */
|
|
||||||
|
|
||||||
/* ── KPI / aggregate cards ───────────────────────────────────────────────────
|
|
||||||
A responsive strip of headline numbers. .agg-card.alert / .caution tint the
|
|
||||||
whole card when a watched metric goes non-zero. */
|
|
||||||
.agg-grid {
|
|
||||||
display: grid;
|
|
||||||
grid-template-columns: repeat(6, 1fr);
|
|
||||||
gap: 0.75rem;
|
|
||||||
margin-bottom: 1rem;
|
|
||||||
}
|
|
||||||
@media (max-width: 1100px) { .agg-grid { grid-template-columns: repeat(3, 1fr); } }
|
|
||||||
@media (max-width: 620px) { .agg-grid { grid-template-columns: repeat(2, 1fr); } }
|
|
||||||
|
|
||||||
.agg-card {
|
|
||||||
background: var(--card);
|
|
||||||
border: 1px solid var(--rule);
|
|
||||||
border-radius: 8px;
|
|
||||||
padding: 0.7rem 0.9rem;
|
|
||||||
}
|
|
||||||
.agg-label {
|
|
||||||
font-size: 0.68rem;
|
|
||||||
font-weight: 600;
|
|
||||||
text-transform: uppercase;
|
|
||||||
letter-spacing: 0.07em;
|
|
||||||
color: var(--ink-faint);
|
|
||||||
}
|
|
||||||
.agg-value {
|
|
||||||
margin-top: 0.25rem;
|
|
||||||
font-size: 1.5rem;
|
|
||||||
font-weight: 600;
|
|
||||||
line-height: 1.1;
|
|
||||||
display: flex;
|
|
||||||
align-items: baseline;
|
|
||||||
gap: 0.35rem;
|
|
||||||
}
|
|
||||||
.agg-sub { /* trailing "/ 54", "ms" etc. — quieter */
|
|
||||||
font-size: 0.85rem;
|
|
||||||
font-weight: 400;
|
|
||||||
color: var(--ink-faint);
|
|
||||||
}
|
|
||||||
.agg-card.alert { border-color: #eec3c3; background: var(--bad-bg); }
|
|
||||||
.agg-card.alert .agg-value { color: var(--bad); }
|
|
||||||
.agg-card.caution { border-color: #efd6a6; background: var(--warn-bg); }
|
|
||||||
.agg-card.caution .agg-value { color: #b56a00; }
|
|
||||||
|
|
||||||
/* ── Metric card + key/value rows ────────────────────────────────────────────
|
|
||||||
A .panel-head over a stack of .kv rows: label left, monospace value right.
|
|
||||||
Zebra striping on even rows. .v.warn / .v.bad / .v.ok recolour a value. */
|
|
||||||
.card-grid {
|
|
||||||
display: grid;
|
|
||||||
grid-template-columns: repeat(auto-fill, minmax(290px, 1fr));
|
|
||||||
gap: 0.85rem;
|
|
||||||
margin-bottom: 1rem;
|
|
||||||
}
|
|
||||||
.metric-card {
|
|
||||||
background: var(--card);
|
|
||||||
border: 1px solid var(--rule);
|
|
||||||
border-radius: 8px;
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
.metric-card .panel-head { margin: 0; }
|
|
||||||
|
|
||||||
.kv {
|
|
||||||
display: flex;
|
|
||||||
justify-content: space-between;
|
|
||||||
align-items: baseline;
|
|
||||||
gap: 1rem;
|
|
||||||
padding: 0.32rem 0.9rem;
|
|
||||||
font-size: 0.85rem;
|
|
||||||
}
|
|
||||||
.kv:nth-child(even) { background: #fbfbf9; }
|
|
||||||
.kv .k { color: var(--ink-soft); }
|
|
||||||
.kv .v {
|
|
||||||
font-family: var(--mono);
|
|
||||||
font-variant-numeric: tabular-nums;
|
|
||||||
text-align: right;
|
|
||||||
}
|
|
||||||
.kv .v.warn { color: var(--warn); }
|
|
||||||
.kv .v.bad { color: var(--bad); }
|
|
||||||
.kv .v.ok { color: var(--ok); }
|
|
||||||
|
|
||||||
/* ── Toolbar ─────────────────────────────────────────────────────────────────
|
|
||||||
Filter/search row that sits inside a .panel above a table. */
|
|
||||||
.toolbar {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 0.6rem;
|
|
||||||
padding: 0.6rem 0.9rem;
|
|
||||||
border-bottom: 1px solid var(--rule);
|
|
||||||
}
|
|
||||||
.toolbar .spacer { flex: 1; }
|
|
||||||
.tb-search { max-width: 280px; }
|
|
||||||
.tb-state { max-width: 150px; }
|
|
||||||
.tb-check {
|
|
||||||
display: flex; align-items: center; gap: 0.35rem;
|
|
||||||
font-size: 0.82rem; color: var(--ink-soft); white-space: nowrap;
|
|
||||||
user-select: none;
|
|
||||||
}
|
|
||||||
.tb-count { font-family: var(--mono); font-size: 0.78rem; color: var(--ink-faint); }
|
|
||||||
|
|
||||||
/* ── Data table ──────────────────────────────────────────────────────────────
|
|
||||||
Dense, hairline-ruled table. Uppercase sticky head on a faint fill; numeric
|
|
||||||
columns get .num (right-aligned, monospace). Rows are clickable by default —
|
|
||||||
drop the cursor/hover rules if yours are not. */
|
|
||||||
.table-wrap { overflow-x: auto; }
|
|
||||||
|
|
||||||
.data-table {
|
|
||||||
width: 100%;
|
|
||||||
border-collapse: collapse;
|
|
||||||
font-size: 0.85rem;
|
|
||||||
}
|
|
||||||
.data-table th,
|
|
||||||
.data-table td {
|
|
||||||
padding: 0.45rem 0.8rem;
|
|
||||||
text-align: left;
|
|
||||||
white-space: nowrap;
|
|
||||||
border-bottom: 1px solid var(--rule);
|
|
||||||
}
|
|
||||||
.data-table th {
|
|
||||||
font-size: 0.7rem;
|
|
||||||
font-weight: 600;
|
|
||||||
text-transform: uppercase;
|
|
||||||
letter-spacing: 0.05em;
|
|
||||||
color: var(--ink-faint);
|
|
||||||
background: #fbfbf9;
|
|
||||||
position: sticky;
|
|
||||||
top: 0;
|
|
||||||
}
|
|
||||||
.data-table th.num,
|
|
||||||
.data-table td.num { text-align: right; font-family: var(--mono); }
|
|
||||||
|
|
||||||
.data-table th.sortable { cursor: pointer; user-select: none; }
|
|
||||||
.data-table th.sortable:hover { color: var(--ink); }
|
|
||||||
.data-table th.sorted-asc::after { content: ' \2191'; color: var(--accent); }
|
|
||||||
.data-table th.sorted-desc::after { content: ' \2193'; color: var(--accent); }
|
|
||||||
|
|
||||||
.data-table tbody tr { cursor: pointer; transition: background 0.08s; }
|
|
||||||
.data-table tbody tr:hover { background: #f3f6fd; }
|
|
||||||
.data-table tbody tr:last-child td { border-bottom: none; }
|
|
||||||
|
|
||||||
.empty-row {
|
|
||||||
text-align: center !important;
|
|
||||||
color: var(--ink-faint);
|
|
||||||
padding: 1.6rem !important;
|
|
||||||
font-style: italic;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ── Direction / category tag ────────────────────────────────────────────────
|
|
||||||
Tiny inline tag for a per-row category (e.g. read vs write). */
|
|
||||||
.dir-tag {
|
|
||||||
font-size: 0.68rem;
|
|
||||||
font-weight: 600;
|
|
||||||
text-transform: uppercase;
|
|
||||||
letter-spacing: 0.05em;
|
|
||||||
padding: 0.1rem 0.4rem;
|
|
||||||
border-radius: 3px;
|
|
||||||
}
|
|
||||||
.dir-read { color: var(--accent-deep); background: #e7ecfb; }
|
|
||||||
.dir-write { color: #8a5a00; background: var(--warn-bg); }
|
|
||||||
|
|
||||||
/* ── Inline notice ───────────────────────────────────────────────────────────
|
|
||||||
A .panel with a warning tint — for "this thing is gone / degraded" banners. */
|
|
||||||
.notice {
|
|
||||||
padding: 0.85rem 1.1rem;
|
|
||||||
margin-bottom: 1rem;
|
|
||||||
color: #b56a00;
|
|
||||||
background: var(--warn-bg);
|
|
||||||
border-color: #efd6a6;
|
|
||||||
}
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,19 +0,0 @@
|
|||||||
// Sidebar nav collapse state — persisted in the `otopcua_nav` cookie so it
|
|
||||||
// survives full page reloads and reconnects. Invoked from MainLayout.razor via
|
|
||||||
// JS interop (window.navState.get / .set). Mirrors the ScadaLink pattern at
|
|
||||||
// /Users/dohertj2/Desktop/scadalink-design/src/ScadaLink.CentralUI/wwwroot/js/nav-state.js.
|
|
||||||
window.navState = {
|
|
||||||
// Returns the raw cookie value (comma-separated expanded section ids), or
|
|
||||||
// an empty string when the cookie is absent.
|
|
||||||
get: function () {
|
|
||||||
const match = document.cookie.match(/(?:^|;\s*)otopcua_nav=([^;]*)/);
|
|
||||||
return match ? decodeURIComponent(match[1]) : "";
|
|
||||||
},
|
|
||||||
// Writes the cookie with a one-year lifetime. SameSite=Lax; not HttpOnly
|
|
||||||
// (JS must write it) and not sensitive.
|
|
||||||
set: function (value) {
|
|
||||||
const oneYearSeconds = 60 * 60 * 24 * 365;
|
|
||||||
document.cookie = "otopcua_nav=" + encodeURIComponent(value) +
|
|
||||||
";path=/;max-age=" + oneYearSeconds + ";samesite=lax";
|
|
||||||
}
|
|
||||||
};
|
|
||||||
@@ -147,7 +147,7 @@ if (hasAdmin)
|
|||||||
// registered". Idempotent on fused admin,driver nodes (TryAddEnumerable de-dups).
|
// registered". Idempotent on fused admin,driver nodes (TryAddEnumerable de-dups).
|
||||||
builder.Services.AddOtOpcUaDriverProbes();
|
builder.Services.AddOtOpcUaDriverProbes();
|
||||||
// Flow AuthenticationState through cascading parameters so <AuthorizeView/> works
|
// Flow AuthenticationState through cascading parameters so <AuthorizeView/> works
|
||||||
// inside interactive components (NavSidebar's session block).
|
// in the static MainLayout footer and other components (e.g. Account.razor, Routes.razor).
|
||||||
builder.Services.AddCascadingAuthenticationState();
|
builder.Services.AddCascadingAuthenticationState();
|
||||||
builder.Services.AddSignalR();
|
builder.Services.AddSignalR();
|
||||||
builder.Services.AddOtOpcUaAdminClients();
|
builder.Services.AddOtOpcUaAdminClients();
|
||||||
|
|||||||
Reference in New Issue
Block a user