diff --git a/src/Umbraco.Cms.14.x/Umbraco.Cms.14.x.csproj b/src/Umbraco.Cms.14.x/Umbraco.Cms.14.x.csproj index 7322be7..70fc545 100644 --- a/src/Umbraco.Cms.14.x/Umbraco.Cms.14.x.csproj +++ b/src/Umbraco.Cms.14.x/Umbraco.Cms.14.x.csproj @@ -9,13 +9,13 @@ - + diff --git a/src/Umbraco.Cms.14.x/Views/home.cshtml b/src/Umbraco.Cms.14.x/Views/home.cshtml index a717a1b..96c7216 100644 --- a/src/Umbraco.Cms.14.x/Views/home.cshtml +++ b/src/Umbraco.Cms.14.x/Views/home.cshtml @@ -1,5 +1,7 @@ @using Umbraco.Cms.Web.Common.PublishedModels; @inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage @{ - Layout = null; -} \ No newline at end of file + Layout = "Layout.cshtml"; +} + +@await Html.GetBlockGridHtmlAsync(Model.Blocks) \ No newline at end of file diff --git a/src/Umbraco.Cms.14.x/appsettings.Development.json b/src/Umbraco.Cms.14.x/appsettings.Development.json index f62b5b1..9413e85 100644 --- a/src/Umbraco.Cms.14.x/appsettings.Development.json +++ b/src/Umbraco.Cms.14.x/appsettings.Development.json @@ -42,13 +42,7 @@ "RuntimeMinification": { "UseInMemoryCache": true, "CacheBuster": "Timestamp" - }, - //"Security": { - // "BackOfficeHost": "http://localhost:5173", - // "AuthorizeCallbackPathName": "/oauth_complete", - // "AuthorizeCallbackLogoutPathName": "/logout", - // "AuthorizeCallbackErrorPathName": "/error" - //} + } } } } diff --git a/src/Umbraco.Community.BlockPreview.UI/Umbraco.Community.BlockPreview.UI.esproj b/src/Umbraco.Community.BlockPreview.UI/Umbraco.Community.BlockPreview.UI.esproj index 8c1e572..7935972 100644 --- a/src/Umbraco.Community.BlockPreview.UI/Umbraco.Community.BlockPreview.UI.esproj +++ b/src/Umbraco.Community.BlockPreview.UI/Umbraco.Community.BlockPreview.UI.esproj @@ -1,8 +1,8 @@  - - false - false - Umbraco.Community.BlockPreview - $(MSBuildProjectDirectory)\dist - + + false + false + Umbraco.Community.BlockPreview + $(MSBuildProjectDirectory)\dist + \ No newline at end of file diff --git a/src/Umbraco.Community.BlockPreview.UI/public/umbraco-package.json b/src/Umbraco.Community.BlockPreview.UI/public/umbraco-package.json index 4a79d5b..64e1553 100644 --- a/src/Umbraco.Community.BlockPreview.UI/public/umbraco-package.json +++ b/src/Umbraco.Community.BlockPreview.UI/public/umbraco-package.json @@ -2,7 +2,7 @@ "$schema": "../umbraco-package-schema.json", "name": "Umbraco.Community.BlockPreview", "id": "Umbraco.Community.BlockPreview", - "version": "2.0.0-alpha006", + "version": "2.0.0-alpha007", "allowTelemetry": true, "extensions": [ { diff --git a/src/Umbraco.Community.BlockPreview/BlockPreviewComposer.cs b/src/Umbraco.Community.BlockPreview/BlockPreviewComposer.cs index 2843ffc..91c7e0e 100644 --- a/src/Umbraco.Community.BlockPreview/BlockPreviewComposer.cs +++ b/src/Umbraco.Community.BlockPreview/BlockPreviewComposer.cs @@ -4,7 +4,6 @@ using Umbraco.Cms.Core.Composing; using Umbraco.Cms.Core.DependencyInjection; using Umbraco.Cms.Core.Notifications; -using Umbraco.Community.BlockPreview.Extensions; using Umbraco.Community.BlockPreview.Helpers; using Umbraco.Community.BlockPreview.Interfaces; using Umbraco.Community.BlockPreview.NotificationHandlers; diff --git a/src/Umbraco.Community.BlockPreview/BlockPreviewOptions.cs b/src/Umbraco.Community.BlockPreview/BlockPreviewOptions.cs index 395e7c2..fdc8e23 100644 --- a/src/Umbraco.Community.BlockPreview/BlockPreviewOptions.cs +++ b/src/Umbraco.Community.BlockPreview/BlockPreviewOptions.cs @@ -16,8 +16,8 @@ public BlockPreviewOptions() public class BlockTypeSettings { - public bool Enabled { get; set; } - public string[]? ViewLocations { get; set; } - public string[]? ContentTypes { get; set; } + public bool Enabled { get; set; } = false; + public string[]? ViewLocations { get; set; } = []; + public string[]? ContentTypes { get; set; } = []; } } \ No newline at end of file diff --git a/src/Umbraco.Community.BlockPreview/Extensions/BlockPreviewUmbracoBuilderExtensions.cs b/src/Umbraco.Community.BlockPreview/Extensions/BlockPreviewUmbracoBuilderExtensions.cs index 82a0414..0940750 100644 --- a/src/Umbraco.Community.BlockPreview/Extensions/BlockPreviewUmbracoBuilderExtensions.cs +++ b/src/Umbraco.Community.BlockPreview/Extensions/BlockPreviewUmbracoBuilderExtensions.cs @@ -17,7 +17,7 @@ public static IUmbracoBuilder AddBlockPreview(this IUmbracoBuilder builder, ArgumentNullException.ThrowIfNull(builder); var optionsBuilder = builder.Services.AddOptions() - .BindConfiguration(Constants.Configuration.AppPluginsRoot) + .BindConfiguration(Constants.Configuration.AppSettingsRoot) .ValidateDataAnnotations(); configure?.Invoke(optionsBuilder); diff --git a/src/Umbraco.Community.BlockPreview/Umbraco.Community.BlockPreview.csproj b/src/Umbraco.Community.BlockPreview/Umbraco.Community.BlockPreview.csproj index d17caef..a5ce3de 100644 --- a/src/Umbraco.Community.BlockPreview/Umbraco.Community.BlockPreview.csproj +++ b/src/Umbraco.Community.BlockPreview/Umbraco.Community.BlockPreview.csproj @@ -17,7 +17,7 @@ true 2.0.0 - alpha006 + alpha007 Rick Butterfield, Dave Woestenborghs, Matthew Wise $([System.DateTime]::UtcNow.ToString(`yyyy`)) © Rick Butterfield diff --git a/src/Umbraco.Community.BlockPreview/wwwroot/App_Plugins/Umbraco.Community.BlockPreview/umbraco-package.json b/src/Umbraco.Community.BlockPreview/wwwroot/App_Plugins/Umbraco.Community.BlockPreview/umbraco-package.json index 4a79d5b..64e1553 100644 --- a/src/Umbraco.Community.BlockPreview/wwwroot/App_Plugins/Umbraco.Community.BlockPreview/umbraco-package.json +++ b/src/Umbraco.Community.BlockPreview/wwwroot/App_Plugins/Umbraco.Community.BlockPreview/umbraco-package.json @@ -2,7 +2,7 @@ "$schema": "../umbraco-package-schema.json", "name": "Umbraco.Community.BlockPreview", "id": "Umbraco.Community.BlockPreview", - "version": "2.0.0-alpha006", + "version": "2.0.0-alpha007", "allowTelemetry": true, "extensions": [ {