From 069a7c656c9288b0bd473f2677485fdd6f99aecc Mon Sep 17 00:00:00 2001 From: Kevin Jump Date: Sat, 18 Jun 2022 13:01:14 +0100 Subject: [PATCH] Razor Class library the package (for v10) #30 --- .../Composers/MaintenceModeComposer.cs | 43 +++++++++++++++++- .../Our.Umbraco.MaintenanceMode.csproj | 2 + .../build/Our.Umbraco.MaintenanceMode.targets | 16 +------ .../MaintenanceMode.Dashboard.js | 0 .../MaintenanceMode.Service.js | 0 .../MaintenanceMode.css | 0 .../MaintenanceModeDashboard.html | 0 .../advanced.html | 0 .../img/duggfest_tshirt.jpg | Bin .../img/nasa_console.jpg | Bin .../lang/en-US.xml | 0 .../package.manifest | 0 12 files changed, 44 insertions(+), 17 deletions(-) rename Our.Umbraco.MaintenanceMode/{App_Plugins/Our.Umbraco.MaintenanceMode => wwwroot}/MaintenanceMode.Dashboard.js (100%) rename Our.Umbraco.MaintenanceMode/{App_Plugins/Our.Umbraco.MaintenanceMode => wwwroot}/MaintenanceMode.Service.js (100%) rename Our.Umbraco.MaintenanceMode/{App_Plugins/Our.Umbraco.MaintenanceMode => wwwroot}/MaintenanceMode.css (100%) rename Our.Umbraco.MaintenanceMode/{App_Plugins/Our.Umbraco.MaintenanceMode => wwwroot}/MaintenanceModeDashboard.html (100%) rename Our.Umbraco.MaintenanceMode/{App_Plugins/Our.Umbraco.MaintenanceMode => wwwroot}/advanced.html (100%) rename Our.Umbraco.MaintenanceMode/{App_Plugins/Our.Umbraco.MaintenanceMode => wwwroot}/img/duggfest_tshirt.jpg (100%) rename Our.Umbraco.MaintenanceMode/{App_Plugins/Our.Umbraco.MaintenanceMode => wwwroot}/img/nasa_console.jpg (100%) rename Our.Umbraco.MaintenanceMode/{App_Plugins/Our.Umbraco.MaintenanceMode => wwwroot}/lang/en-US.xml (100%) rename Our.Umbraco.MaintenanceMode/{App_Plugins/Our.Umbraco.MaintenanceMode => wwwroot}/package.manifest (100%) diff --git a/Our.Umbraco.MaintenanceMode/Composers/MaintenceModeComposer.cs b/Our.Umbraco.MaintenanceMode/Composers/MaintenceModeComposer.cs index 4ec3dd4..f274c14 100644 --- a/Our.Umbraco.MaintenanceMode/Composers/MaintenceModeComposer.cs +++ b/Our.Umbraco.MaintenanceMode/Composers/MaintenceModeComposer.cs @@ -6,11 +6,13 @@ using Our.Umbraco.MaintenanceMode.NotificationHandlers.Media; using Our.Umbraco.MaintenanceMode.NotificationHandlers.ServerVariables; using Our.Umbraco.MaintenanceMode.Services; - +using System.Collections.Generic; using System.Linq; - +using Umbraco.Cms.Core; using Umbraco.Cms.Core.Composing; +using Umbraco.Cms.Core.Dashboards; using Umbraco.Cms.Core.DependencyInjection; +using Umbraco.Cms.Core.Manifest; using Umbraco.Cms.Core.Notifications; using Umbraco.Extensions; @@ -45,6 +47,9 @@ public static IUmbracoBuilder AddMaintenceManager(this IUmbracoBuilder builder) builder.AddNotificationHandler(); + if (!builder.ManifestFilters().Has()) + builder.ManifestFilters().Append(); + return builder; } @@ -64,5 +69,39 @@ private static void AddNotificationHandlers(this IUmbracoBuilder builder) } } + internal class MaintenanceModeManifestFilter : IManifestFilter + { + public void Filter(List manifests) + { + manifests.Add(new PackageManifest() + { + PackageName = "Our.Umbraco.MaintenanceMode", + Version = "", + AllowPackageTelemetry = true, + Scripts = new [] { + "/App_Plugins/Our.Umbraco.MaintenanceMode/MaintenanceMode.Dashboard.js", + "/App_Plugins/Our.Umbraco.MaintenanceMode/MaintenanceMode.Service.js" + }, + Stylesheets = new [] { + "/App_Plugins/Our.Umbraco.MaintenanceMode/MaintenanceMode.css" + }, + Dashboards = new ManifestDashboard[] { + new ManifestDashboard { + Alias = "maintenanceModeDashboard", + View = "/App_Plugins/Our.Umbraco.MaintenanceMode/MaintenanceModeDashboard.html", + Sections = new [] { Constants.Applications.Content }, + Weight = -10, + AccessRules = new IAccessRule[] { + new AccessRule { + Type = AccessRuleType.Grant, + Value = "admin" + } + } + } + } + }); + } + } + } diff --git a/Our.Umbraco.MaintenanceMode/Our.Umbraco.MaintenanceMode.csproj b/Our.Umbraco.MaintenanceMode/Our.Umbraco.MaintenanceMode.csproj index 502317f..5c03625 100644 --- a/Our.Umbraco.MaintenanceMode/Our.Umbraco.MaintenanceMode.csproj +++ b/Our.Umbraco.MaintenanceMode/Our.Umbraco.MaintenanceMode.csproj @@ -26,6 +26,8 @@ maintenance-icon.png readme.md + App_Plugins/Our.Umbraco.MaintenanceMode + diff --git a/Our.Umbraco.MaintenanceMode/build/Our.Umbraco.MaintenanceMode.targets b/Our.Umbraco.MaintenanceMode/build/Our.Umbraco.MaintenanceMode.targets index 1e10f74..074b022 100644 --- a/Our.Umbraco.MaintenanceMode/build/Our.Umbraco.MaintenanceMode.targets +++ b/Our.Umbraco.MaintenanceMode/build/Our.Umbraco.MaintenanceMode.targets @@ -5,25 +5,11 @@ $(MSBuildThisFileDirectory)..\$(OurUmbracoMaintenanceModeFolder)\**\*.* - - - - - - - - - - - - + diff --git a/Our.Umbraco.MaintenanceMode/App_Plugins/Our.Umbraco.MaintenanceMode/MaintenanceMode.Dashboard.js b/Our.Umbraco.MaintenanceMode/wwwroot/MaintenanceMode.Dashboard.js similarity index 100% rename from Our.Umbraco.MaintenanceMode/App_Plugins/Our.Umbraco.MaintenanceMode/MaintenanceMode.Dashboard.js rename to Our.Umbraco.MaintenanceMode/wwwroot/MaintenanceMode.Dashboard.js diff --git a/Our.Umbraco.MaintenanceMode/App_Plugins/Our.Umbraco.MaintenanceMode/MaintenanceMode.Service.js b/Our.Umbraco.MaintenanceMode/wwwroot/MaintenanceMode.Service.js similarity index 100% rename from Our.Umbraco.MaintenanceMode/App_Plugins/Our.Umbraco.MaintenanceMode/MaintenanceMode.Service.js rename to Our.Umbraco.MaintenanceMode/wwwroot/MaintenanceMode.Service.js diff --git a/Our.Umbraco.MaintenanceMode/App_Plugins/Our.Umbraco.MaintenanceMode/MaintenanceMode.css b/Our.Umbraco.MaintenanceMode/wwwroot/MaintenanceMode.css similarity index 100% rename from Our.Umbraco.MaintenanceMode/App_Plugins/Our.Umbraco.MaintenanceMode/MaintenanceMode.css rename to Our.Umbraco.MaintenanceMode/wwwroot/MaintenanceMode.css diff --git a/Our.Umbraco.MaintenanceMode/App_Plugins/Our.Umbraco.MaintenanceMode/MaintenanceModeDashboard.html b/Our.Umbraco.MaintenanceMode/wwwroot/MaintenanceModeDashboard.html similarity index 100% rename from Our.Umbraco.MaintenanceMode/App_Plugins/Our.Umbraco.MaintenanceMode/MaintenanceModeDashboard.html rename to Our.Umbraco.MaintenanceMode/wwwroot/MaintenanceModeDashboard.html diff --git a/Our.Umbraco.MaintenanceMode/App_Plugins/Our.Umbraco.MaintenanceMode/advanced.html b/Our.Umbraco.MaintenanceMode/wwwroot/advanced.html similarity index 100% rename from Our.Umbraco.MaintenanceMode/App_Plugins/Our.Umbraco.MaintenanceMode/advanced.html rename to Our.Umbraco.MaintenanceMode/wwwroot/advanced.html diff --git a/Our.Umbraco.MaintenanceMode/App_Plugins/Our.Umbraco.MaintenanceMode/img/duggfest_tshirt.jpg b/Our.Umbraco.MaintenanceMode/wwwroot/img/duggfest_tshirt.jpg similarity index 100% rename from Our.Umbraco.MaintenanceMode/App_Plugins/Our.Umbraco.MaintenanceMode/img/duggfest_tshirt.jpg rename to Our.Umbraco.MaintenanceMode/wwwroot/img/duggfest_tshirt.jpg diff --git a/Our.Umbraco.MaintenanceMode/App_Plugins/Our.Umbraco.MaintenanceMode/img/nasa_console.jpg b/Our.Umbraco.MaintenanceMode/wwwroot/img/nasa_console.jpg similarity index 100% rename from Our.Umbraco.MaintenanceMode/App_Plugins/Our.Umbraco.MaintenanceMode/img/nasa_console.jpg rename to Our.Umbraco.MaintenanceMode/wwwroot/img/nasa_console.jpg diff --git a/Our.Umbraco.MaintenanceMode/App_Plugins/Our.Umbraco.MaintenanceMode/lang/en-US.xml b/Our.Umbraco.MaintenanceMode/wwwroot/lang/en-US.xml similarity index 100% rename from Our.Umbraco.MaintenanceMode/App_Plugins/Our.Umbraco.MaintenanceMode/lang/en-US.xml rename to Our.Umbraco.MaintenanceMode/wwwroot/lang/en-US.xml diff --git a/Our.Umbraco.MaintenanceMode/App_Plugins/Our.Umbraco.MaintenanceMode/package.manifest b/Our.Umbraco.MaintenanceMode/wwwroot/package.manifest similarity index 100% rename from Our.Umbraco.MaintenanceMode/App_Plugins/Our.Umbraco.MaintenanceMode/package.manifest rename to Our.Umbraco.MaintenanceMode/wwwroot/package.manifest