Styles

usercode · usercode · commit da220ff2a817 · 2024-12-30T14:15:15.000+01:00
diff --git a/src/DragonFly.App.Server/Components/App.razor b/src/DragonFly.App.Server/Components/App.razor
@@ -8,7 +8,7 @@
     <link href="@Assets["_content/DragonFly.Client/css/bootstrap.min.css"]" rel="stylesheet" />
     <link href="@Assets["_content/DragonFly.Client/css/all.min.css"]" rel="stylesheet" />
     <link href="@Assets["_content/DragonFly.Client/lib/font-awesome/css/all.min.css"]" rel="stylesheet" />
-    <link href="@Assets["DragonFly.App.WebAssembly.Client.styles.css"]" rel="stylesheet" />
+    <link href="@Assets["DragonFly.App.Server.styles.css"]" rel="stylesheet" />
     <script src="/_content/BlazorStrap/blazorstrap.js"></script>
     <script src="/_content/DragonFly.Client/lib/tinymce/tinymce.min.js"></script>
     <script src="/_content/TinyMCE.Blazor/tinymce-blazor.js"></script>
diff --git a/src/DragonFly.App.Server/Program.cs b/src/DragonFly.App.Server/Program.cs
@@ -9,6 +9,7 @@
 using DragonFly.API;
 using DragonFly.App.Server.Components;
 using DragonFly.AspNetCore;
+using DragonFly.AspNetCore.Permissions;
 using DragonFly.Client;
 using DragonFly.MongoDB;
 using DragonFlyABC;
@@ -82,6 +83,8 @@
                                             x.Field().Add<HtmlField>().WithTinyMceView();
                                         }));
 
+builder.Services.AddSingleton<IPrincipalContext, PrincipalHttpContext>();
+
 var app = builder.Build();
 
 //init DragonFly
diff --git a/src/DragonFly.App.WebAssembly.Client/wwwroot/index.html b/src/DragonFly.App.WebAssembly.Client/wwwroot/index.html
@@ -1,6 +1,5 @@
 ﻿<!DOCTYPE html>
 <html>
-
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
@@ -14,7 +13,6 @@
     <script src="_content/DragonFly.Client/lib/tinymce/tinymce.min.js"></script>
     <script src="_content/TinyMCE.Blazor/tinymce-blazor.js"></script>
 </head>
-
 <body>
     <app>
         <div style="margin:auto; width:100%; text-align:center">
@@ -30,5 +28,4 @@ <h1>DragonFly CMS</h1>
     </div>
     <script src="_framework/blazor.webassembly.js"></script>
 </body>
-
 </html>
diff --git a/src/DragonFly.AspNetCore/Permissions/PrincipalHttpContext.cs b/src/DragonFly.AspNetCore/Permissions/PrincipalHttpContext.cs
@@ -0,0 +1,23 @@
+﻿// Copyright (c) usercode
+// https://github.com/usercode/DragonFly
+// MIT License
+
+using System.Security.Claims;
+
+namespace DragonFly.AspNetCore.Permissions;
+
+public class PrincipalHttpContext : IPrincipalContext
+{
+    public PrincipalHttpContext(IHttpContextAccessor httpContextAccessor)
+    {
+        HttpContextAccessor = httpContextAccessor;
+    }
+
+    private readonly IHttpContextAccessor HttpContextAccessor;
+
+    public ClaimsPrincipal? Current
+    {
+        get => HttpContextAccessor.HttpContext?.User;
+        set { }
+    }
+}
diff --git a/src/DragonFly.Client/Pages/Assets/AssetDetail.razor b/src/DragonFly.Client/Pages/Assets/AssetDetail.razor
@@ -139,7 +139,7 @@
                                         </div>
                                         @if (Entity.Hash != null)
                                         {
-                                            <div style="margin: 2rem 0;">
+                                            <div style="margin: 1rem 0;">
                                                 @AssetPreviewManager.CreateComponent(Entity)
                                             </div>
                                         }
diff --git a/src/DragonFly.Client/Shared/PermissionItemView.razor b/src/DragonFly.Client/Shared/PermissionItemView.razor
@@ -9,10 +9,13 @@
         {
             var p1 = permission;
 
-            Permission[] impliedBy = p1.Element.GetImpliedPermissions().Where(i => Permissions.Where(x => x.IsSelected).Any(p => p.Element == i)).ToArray();
+            Permission[] impliedBy = p1.Element.GetImpliedPermissions()
+                                                        .Where(i => Permissions.Where(x => x.IsSelected)
+                                                        .Any(p => p.Element == i))
+                                                        .ToArray();
 
             <li class="list-group-item">
-                <input id="check_@permission.Element.Name" type="checkbox" class="form-check-input me-2" @bind="permission.IsSelected" @bind:after="() => PermissionSelected(p1)" />
+                <input id="check_@permission.Element.Name" type="checkbox" class="form-check-input me-2" @bind="permission.IsSelected" />
 
                 @if (impliedBy.Length > 0)
                 {
@@ -42,9 +45,4 @@
 
     [Parameter]
     public IEnumerable<SelectableElement<Permission>> Permissions { get; set; }
-
-    private void PermissionSelected(SelectableElement<Permission> permission)
-    {
-
-    }
 }
diff --git a/src/DragonFly.Client/wwwroot/css/all.css b/src/DragonFly.Client/wwwroot/css/all.css
@@ -30,9 +30,9 @@ button:disabled {
   pointer-events: all !important;
 }
 
-input:read-only {
+input[type=text]:read-only {
   cursor: not-allowed;
-  background: #f5f5f5 !important;
+  background-color: #f5f5f5 !important;
 }
 
 .pagination {
diff --git a/src/DragonFly.Client/wwwroot/css/all.min.css b/src/DragonFly.Client/wwwroot/css/all.min.css
diff --git a/src/DragonFly.Client/wwwroot/css/app.scss b/src/DragonFly.Client/wwwroot/css/app.scss
@@ -30,9 +30,9 @@ button:disabled {
     pointer-events: all !important;
 }
 
-input:read-only {
+input[type=text]:read-only {
     cursor: not-allowed;
-    background: #f5f5f5 !important;
+    background-color: #f5f5f5 !important;
 }
 
 .pagination {
diff --git a/src/DragonFly.Client/wwwroot/css/bootstrap.css b/src/DragonFly.Client/wwwroot/css/bootstrap.css
diff --git a/src/DragonFly.Client/wwwroot/css/bootstrap.min.css b/src/DragonFly.Client/wwwroot/css/bootstrap.min.css
diff --git a/src/DragonFly.Client/wwwroot/css/bootstrap.scss b/src/DragonFly.Client/wwwroot/css/bootstrap.scss

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@`
`139`	`139`	`</div>`
`140`	`140`	`@if (Entity.Hash != null)`
`141`	`141`	`{`
`142`		`- <div style="margin: 2rem 0;">`
	`142`	`+ <div style="margin: 1rem 0;">`
`143`	`143`	`@AssetPreviewManager.CreateComponent(Entity)`
`144`	`144`	`</div>`
`145`	`145`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,9 +30,9 @@ button:disabled {`
`30`	`30`	`pointer-events: all !important;`
`31`	`31`	`}`
`32`	`32`
`33`		`-input:read-only {`
	`33`	`+input[type=text]:read-only {`
`34`	`34`	`cursor: not-allowed;`
`35`		`- background: #f5f5f5 !important;`
	`35`	`+ background-color: #f5f5f5 !important;`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`.pagination {`