leon.hoppe/HopFrame
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Started switching to bootstrap library

Browse Source
This commit is contained in:
Leon Hoppe
2024-07-24 18:44:27 +02:00
parent e84b59a466
commit 69c58e61fc
8 changed files with 106 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
HopFrame.Web/HopFrame.Web.csproj
View File

@@ -17,6 +17,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="BlazorStrap" Version="5.2.100.61524" />
<PackageReference Include="BlazorStrap.V5" Version="5.2.100" />
<PackageReference Include="CurrieTechnologies.Razor.SweetAlert2" Version="5.6.0" /> <PackageReference Include="CurrieTechnologies.Razor.SweetAlert2" Version="5.6.0" />
<PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.7" /> <PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.7" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.7" /> <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.7" />

15
HopFrame.Web/Pages/Administration/Layout/AdminLayout.razor
View File

@@ -1,24 +1,23 @@
@using HopFrame.Web.Components @using HopFrame.Web.Components
@using BlazorStrap.V5
@inherits LayoutComponentBase @inherits LayoutComponentBase
<AuthorizedView Permission="@AdminPermissions.IsAdmin" RedirectIfUnauthorized="login?redirect=/administration" /> <AuthorizedView Permission="@AdminPermissions.IsAdmin" RedirectIfUnauthorized="login?redirect=/administration" />
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
<div class="page"> <div class="page">
<div class="sidebar"> <nav>
<AdminMenu/> <AdminMenu/>
</div> </nav>
<main> <main>
<article class="content px-4"> <article class="content px-4">
@Body @Body
<BSCore/>
</article> </article>
</main> </main>
</div> </div>
<div id="blazor-error-ui">
An unhandled error has occurred.
<a href="" class="reload">Reload</a>
<a class="dismiss">🗙</a>
</div>
<script src="_content/CurrieTechnologies.Razor.SweetAlert2/sweetAlert2.min.js"></script> <script src="_content/CurrieTechnologies.Razor.SweetAlert2/sweetAlert2.min.js"></script>
<script src="_content/BlazorStrap/popper.min.js"></script>

96
HopFrame.Web/Pages/Administration/Layout/AdminLayout.razor.css
View File

@@ -1,96 +0,0 @@
.page {
position: relative;
display: flex;
flex-direction: column;
}
main {
flex: 1;
}
.sidebar {
background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%);
}
.top-row {
background-color: #f7f7f7;
border-bottom: 1px solid #d6d5d5;
justify-content: flex-end;
height: 3.5rem;
display: flex;
align-items: center;
}
.top-row ::deep a, .top-row ::deep .btn-link {
white-space: nowrap;
margin-left: 1.5rem;
text-decoration: none;
}
.top-row ::deep a:hover, .top-row ::deep .btn-link:hover {
text-decoration: underline;
}
.top-row ::deep a:first-child {
overflow: hidden;
text-overflow: ellipsis;
}
@media (max-width: 640.98px) {
.top-row {
justify-content: space-between;
}
.top-row ::deep a, .top-row ::deep .btn-link {
margin-left: 0;
}
}
@media (min-width: 641px) {
.page {
flex-direction: row;
}
.sidebar {
width: 250px;
height: 100vh;
position: sticky;
top: 0;
}
.top-row {
position: sticky;
top: 0;
z-index: 1;
}
.top-row.auth ::deep a:first-child {
flex: 1;
text-align: right;
width: 0;
}
.top-row, article {
padding-left: 2rem !important;
padding-right: 1.5rem !important;
}
}
#blazor-error-ui {
background: lightyellow;
bottom: 0;
box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2);
display: none;
left: 0;
padding: 0.6rem 1.25rem 0.7rem 1.25rem;
position: fixed;
width: 100%;
z-index: 1000;
}
#blazor-error-ui .dismiss {
cursor: pointer;
position: absolute;
right: 0.75rem;
top: 0.5rem;
}

60
HopFrame.Web/Pages/Administration/Layout/AdminMenu.razor
View File

@@ -1,32 +1,38 @@
@using Microsoft.AspNetCore.Components.Routing @using BlazorStrap
@using HopFrame.Web.Pages.Administration.Components @using BlazorStrap.V5
<div class="top-row ps-3 navbar navbar-dark">
<div class="container-fluid">
<a class="navbar-brand" href="/administration">HopFrame</a>
</div>
</div>
<input type="checkbox" title="Navigation menu" class="navbar-toggler"/> <BSNavbar Color="BSColor.Light">
<BSContainer Container="Container.Fluid">
<BSNavbarBrand>
@*<img src="logo.svg" alt="logo" width="30" class="d-inline-block align-text-top"/>*@
HopFrame
</BSNavbarBrand>
<BSCollapse IsInNavbar="true">
<Toggler>
<BSNavbarToggle/>
</Toggler>
<Content>
<BSNav MarginEnd="Margins.Auto" MarginBottom="Margins.Small" Class="mb-lg-0">
@foreach (var nav in Subpages) {
<BSNavItem IsActive="IsNavItemActive(nav.Key)" Url="@nav.Key">@nav.Value</BSNavItem>
}
</BSNav>
</Content>
</BSCollapse>
</BSContainer>
</BSNavbar>
<div class="nav-scrollable" onclick="document.querySelector('.navbar-toggler').click()">
<nav class="flex-column" style="display: flex; height: 100%">
<div class="nav-item px-3">
<NavLink class="nav-link" href="administration/users">
<HopIconDisplay Type="HopIconDisplay.HopIcon.User" NavIcon="true"/> Users
</NavLink>
</div>
<div class="nav-item px-3"> @inject NavigationManager Navigator
<NavLink class="nav-link" href="administration/groups">
<HopIconDisplay Type="HopIconDisplay.HopIcon.Group" NavIcon="true"/> Groups
</NavLink>
</div>
<div class="nav-item px-3" style="margin-top: auto"> @code {
<NavLink class="nav-link" href="login"> public static IDictionary<string, string> Subpages = new Dictionary<string, string> {
<HopIconDisplay Type="HopIconDisplay.HopIcon.Logout" NavIcon="true"/> Logout { "administration/users", "Users" },
</NavLink> { "administration/groups", "Groups" }
</div> };
</nav>
</div> public bool IsNavItemActive(string element) {
return Navigator.Uri.Contains(element);
}
}

93
HopFrame.Web/Pages/Administration/Layout/AdminMenu.razor.css
View File

@@ -1,93 +0,0 @@
.navbar-toggler {
appearance: none;
cursor: pointer;
width: 3.5rem;
height: 2.5rem;
color: white;
position: absolute;
top: 0.5rem;
right: 1rem;
border: 1px solid rgba(255, 255, 255, 0.1);
background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%28255, 255, 255, 0.55%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e") no-repeat center/1.75rem rgba(255, 255, 255, 0.1);
}
.navbar-toggler:checked {
background-color: rgba(255, 255, 255, 0.5);
}
.top-row {
height: 3.5rem;
background-color: rgba(0, 0, 0, 0.4);
}
.navbar-brand {
font-size: 1.1rem;
}
.bi {
display: inline-block;
position: relative;
width: 1.25rem;
height: 1.25rem;
margin-right: 0.75rem;
top: -1px;
background-size: cover;
}
.nav-item {
font-size: 0.9rem;
padding-bottom: 0.5rem;
}
.nav-item:first-of-type {
padding-top: 1rem;
}
.nav-item:last-of-type {
padding-bottom: 1rem;
}
.nav-item ::deep .nav-link {
color: #d7d7d7;
background: none;
border: none;
border-radius: 4px;
height: 3rem;
display: flex;
align-items: center;
line-height: 3rem;
width: 100%;
}
.nav-item ::deep a.active {
background-color: rgba(255, 255, 255, 0.37);
color: white;
}
.nav-item ::deep .nav-link:hover {
background-color: rgba(255, 255, 255, 0.1);
color: white;
}
.nav-scrollable {
display: none;
}
.navbar-toggler:checked ~ .nav-scrollable {
display: block;
}
@media (min-width: 641px) {
.navbar-toggler {
display: none;
}
.nav-scrollable {
/* Never collapse the sidebar for wide screens */
display: block;
/* Allow sidebar to scroll for tall menus */
height: calc(100vh - 3.5rem);
overflow-y: auto;
}
}

74
HopFrame.Web/Pages/Administration/UsersPage.razor
View File

@@ -3,6 +3,7 @@
@layout AdminLayout @layout AdminLayout
@using System.Globalization @using System.Globalization
@using BlazorStrap
@using CurrieTechnologies.Razor.SweetAlert2 @using CurrieTechnologies.Razor.SweetAlert2
@using HopFrame.Database.Models @using HopFrame.Database.Models
@using HopFrame.Security.Claims @using HopFrame.Security.Claims
@@ -11,6 +12,8 @@
@using static Microsoft.AspNetCore.Components.Web.RenderMode @using static Microsoft.AspNetCore.Components.Web.RenderMode
@using Microsoft.AspNetCore.Components.Web @using Microsoft.AspNetCore.Components.Web
@using HopFrame.Web.Components @using HopFrame.Web.Components
@using BlazorStrap.V5
@using HopFrame.Web.Pages.Administration.Components
<PageTitle>Users</PageTitle> <PageTitle>Users</PageTitle>
<AuthorizedView Permission="@AdminPermissions.ViewUsers" RedirectIfUnauthorized="login?redirect=/administration/users"/> <AuthorizedView Permission="@AdminPermissions.ViewUsers" RedirectIfUnauthorized="login?redirect=/administration/users"/>
@@ -24,67 +27,67 @@
</h3> </h3>
<form class="d-flex" role="search" @onsubmit="Search"> <form class="d-flex" role="search" @onsubmit="Search">
<input class="form-control me-2" type="search" placeholder="Search" aria-label="Search" @bind="_searchText"> <input class="form-control me-2 input-dark" type="search" placeholder="Search" aria-label="Search" @bind="_searchText">
<button class="btn btn-outline-success" type="submit">Search</button> <BSButton Color="BSColor.Success" IsOutlined="true" type="submit">Search</BSButton>
</form> </form>
</div> </div>
<BSTable IsStriped="true" IsHoverable="true">
<table class="table table-stripped table-hover"> <BSTHead>
<thead> <BSTR>
<tr> <BSTD>#</BSTD>
<th scope="col">#</th> <BSTD>
<th scope="col">
<span class="sorter" @onclick="() => OrderBy(OrderType.Email)">E-Mail</span> <span class="sorter" @onclick="() => OrderBy(OrderType.Email)">E-Mail</span>
@if (_currentOrder == OrderType.Email) { @if (_currentOrder == OrderType.Email) {
<HopIconDisplay Type="_currentOrderDirection == OrderDirection.Desc ? HopIconDisplay.HopIcon.ArrowDown : HopIconDisplay.HopIcon.ArrowUp"/> <HopIconDisplay Type="_currentOrderDirection == OrderDirection.Desc ? HopIconDisplay.HopIcon.ArrowDown : HopIconDisplay.HopIcon.ArrowUp"/>
} }
</th> </BSTD>
<th scope="col"> <BSTD>
<span class="sorter" @onclick="() => OrderBy(OrderType.Username)">Username</span> <span class="sorter" @onclick="() => OrderBy(OrderType.Username)">Username</span>
@if (_currentOrder == OrderType.Username) { @if (_currentOrder == OrderType.Username) {
<HopIconDisplay Type="_currentOrderDirection == OrderDirection.Desc ? HopIconDisplay.HopIcon.ArrowDown : HopIconDisplay.HopIcon.ArrowUp"/> <HopIconDisplay Type="_currentOrderDirection == OrderDirection.Desc ? HopIconDisplay.HopIcon.ArrowDown : HopIconDisplay.HopIcon.ArrowUp"/>
} }
</th> </BSTD>
<th scope="col"> <BSTD>
<span class="sorter" @onclick="() => OrderBy(OrderType.Registered)">Registered</span> <span class="sorter" @onclick="() => OrderBy(OrderType.Registered)">Registered</span>
@if (_currentOrder == OrderType.Registered) { @if (_currentOrder == OrderType.Registered) {
<HopIconDisplay Type="_currentOrderDirection == OrderDirection.Desc ? HopIconDisplay.HopIcon.ArrowDown : HopIconDisplay.HopIcon.ArrowUp"/> <HopIconDisplay Type="_currentOrderDirection == OrderDirection.Desc ? HopIconDisplay.HopIcon.ArrowDown : HopIconDisplay.HopIcon.ArrowUp"/>
} }
</th> </BSTD>
<th scope="col">Primary Group</th> <BSTD>Primary Group</BSTD>
@if (_hasEditPrivileges || _hasDeletePrivileges) { @if (_hasEditPrivileges || _hasDeletePrivileges) {
<th scope="col">Actions</th> <BSTD>Actions</BSTD>
} }
</tr> </BSTR>
</thead> </BSTHead>
<tbody>
<BSTBody>
@foreach (var user in _users) { @foreach (var user in _users) {
<tr> <BSTR>
<td class="bold">@user.Id</td> <BSTD class="bold">@user.Id</BSTD>
<td>@user.Email</td> <BSTD>@user.Email</BSTD>
<td>@user.Username</td> <BSTD>@user.Username</BSTD>
<td>@user.CreatedAt</td> <BSTD>@user.CreatedAt</BSTD>
<td>@GetFriendlyGroupName(user)</td> <BSTD>@GetFriendlyGroupName(user)</BSTD>
@if (_hasEditPrivileges || _hasDeletePrivileges) { @if (_hasEditPrivileges || _hasDeletePrivileges) {
<td> <BSTD>
<div class="btn-group" role="group" aria-label="Basic example"> <BSButtonGroup>
@if (_hasEditPrivileges) { @if (_hasEditPrivileges) {
<button type="button" class="btn btn-warning" @onclick="() => EditUser(user)">Edit</button> <BSButton Color="BSColor.Warning" OnClick="() => EditUser(user)">Edit</BSButton>
} }
@if (_hasDeletePrivileges) { @if (_hasDeletePrivileges) {
<button type="button" class="btn btn-danger" @onclick="() => Delete(user)">Delete</button> <BSButton Color="BSColor.Danger" OnClick="() => Delete(user)">Delete</BSButton>
} }
</div> </BSButtonGroup>
</td> </BSTD>
} }
</tr> </BSTR>
} }
</tbody> </BSTBody>
</table> </BSTable>
@inject IUserService UserService @inject IUserService UserService
@inject IPermissionService PermissionsService @inject IPermissionService PermissionsService
@@ -94,7 +97,7 @@
@code { @code {
private IList<User> _users = new List<User>(); private IList<User> _users = new List<User>();
private IDictionary<Guid, PermissionGroup> _userGroups = new Dictionary<Guid, PermissionGroup>(); private readonly IDictionary<Guid, PermissionGroup> _userGroups = new Dictionary<Guid, PermissionGroup>();
private OrderType _currentOrder = OrderType.None; private OrderType _currentOrder = OrderType.None;
private OrderDirection _currentOrderDirection = OrderDirection.Asc; private OrderDirection _currentOrderDirection = OrderDirection.Asc;
@@ -193,8 +196,7 @@
None, None,
Email, Email,
Username, Username,
Registered, Registered
Group
} }
private enum OrderDirection : byte { private enum OrderDirection : byte {

2
HopFrame.Web/ServiceCollectionExtensions.cs
View File

@@ -1,3 +1,4 @@
using BlazorStrap;
using CurrieTechnologies.Razor.SweetAlert2; using CurrieTechnologies.Razor.SweetAlert2;
using HopFrame.Database; using HopFrame.Database;
using HopFrame.Security.Authentication; using HopFrame.Security.Authentication;
@@ -16,6 +17,7 @@ public static class ServiceCollectionExtensions {
// Component library's // Component library's
services.AddSweetAlert2(); services.AddSweetAlert2();
services.AddBlazorStrap();
//TODO: Use https://blazorstrap.io/V5/V5 //TODO: Use https://blazorstrap.io/V5/V5

1
HopFrame.sln.DotSettings.user
View File

@@ -1,4 +1,5 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation"> <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/Environment/AssemblyExplorer/XmlDocument/@EntryValue">&lt;AssemblyExplorer&gt;&#xD; <s:String x:Key="/Default/Environment/AssemblyExplorer/XmlDocument/@EntryValue">&lt;AssemblyExplorer&gt;&#xD;
&lt;Assembly Path="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\7.0.16\ref\net7.0\System.ComponentModel.Annotations.dll" /&gt;&#xD; &lt;Assembly Path="C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Ref\7.0.16\ref\net7.0\System.ComponentModel.Annotations.dll" /&gt;&#xD;
&lt;Assembly Path="C:\Users\Remote\.nuget\packages\blazorstrap\5.2.100.61524\lib\net7.0\BlazorStrap.dll" /&gt;&#xD;
&lt;/AssemblyExplorer&gt;</s:String></wpf:ResourceDictionary> &lt;/AssemblyExplorer&gt;</s:String></wpf:ResourceDictionary>