Merge branch 'cms-inline' into dev

DeepDrftCms/CmsStartup.cs

@@ -1,17 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-
-namespace DeepDrftCms;
-
-public static class CmsStartup
-{
-    public static IServiceCollection AddCmsServices(this IServiceCollection services)
-    {
-        // CMS-specific services registered here as implementation waves land.
-        //
-        // Note: ITrackService (and its dependencies: TrackRepository, DeepDrftContext) is registered
-        // by DeepDrftPublic.Startup.ConfigureDomainServices, not here. The CMS RCL runs inside the
-        // DeepDrftPublic host, which wires those up before this method is called. A standalone CMS
-        // host would need to register ITrackService separately.
-        return services;
-    }
-}

DeepDrftCms/DeepDrftCms.csproj

@@ -1,28 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
-
-  <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <SupportedPlatform Remove="browser" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MudBlazor" Version="8.15.0" />
-    <PackageReference Include="Cerebellum.AuthBlocks.Web" Version="10.3.32" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\DeepDrftModels\DeepDrftModels.csproj" />
-    <ProjectReference Include="..\DeepDrftData\DeepDrftData.csproj" />
-    <ProjectReference Include="..\DeepDrftShared.Client\DeepDrftShared.Client.csproj" />
-  </ItemGroup>
-
-</Project>

DeepDrftCms/_Imports.razor

@@ -1,15 +0,0 @@
-@using Microsoft.AspNetCore.Authorization
-@using Microsoft.AspNetCore.Components.Authorization
-@using Microsoft.AspNetCore.Components.Forms
-@using Microsoft.AspNetCore.Components.Routing
-@using Microsoft.AspNetCore.Components.Web
-@using Microsoft.AspNetCore.Components.Web.Virtualization
-@using static Microsoft.AspNetCore.Components.Web.RenderMode
-@using Microsoft.Extensions.Logging
-@using Microsoft.JSInterop
-@using DeepDrftCms
-@using DeepDrftModels.Entities
-@using DeepDrftData
-@using Models.Common
-@using MudBlazor
-@layout DeepDrftCms.Layout.CmsLayout

DeepDrftHome.sln

@@ -18,8 +18,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeepDrftData", "DeepDrftDat
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeepDrftContent.Data", "DeepDrftContent.Data\DeepDrftContent.Data.csproj", "{4D025326-7F27-4C42-BE0F-92C1E64E0696}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeepDrftCms", "DeepDrftCms\DeepDrftCms.csproj", "{81F1D47F-F892-45FB-9E35-D7775805FFD3}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeepDrftManager", "DeepDrftManager\DeepDrftManager.csproj", "{E50071B2-A59F-4FB7-A435-5D966C538DDD}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeepDrftShared.Client", "DeepDrftShared.Client\DeepDrftShared.Client.csproj", "{50439EFE-0F45-4CE0-AB1D-4DEA87622E73}"
@@ -142,18 +140,6 @@ Global
 		{4D025326-7F27-4C42-BE0F-92C1E64E0696}.Release|x64.Build.0 = Release|Any CPU
 		{4D025326-7F27-4C42-BE0F-92C1E64E0696}.Release|x86.ActiveCfg = Release|Any CPU
 		{4D025326-7F27-4C42-BE0F-92C1E64E0696}.Release|x86.Build.0 = Release|Any CPU
-		{81F1D47F-F892-45FB-9E35-D7775805FFD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{81F1D47F-F892-45FB-9E35-D7775805FFD3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{81F1D47F-F892-45FB-9E35-D7775805FFD3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{81F1D47F-F892-45FB-9E35-D7775805FFD3}.Debug|x64.Build.0 = Debug|Any CPU
-		{81F1D47F-F892-45FB-9E35-D7775805FFD3}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{81F1D47F-F892-45FB-9E35-D7775805FFD3}.Debug|x86.Build.0 = Debug|Any CPU
-		{81F1D47F-F892-45FB-9E35-D7775805FFD3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{81F1D47F-F892-45FB-9E35-D7775805FFD3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{81F1D47F-F892-45FB-9E35-D7775805FFD3}.Release|x64.ActiveCfg = Release|Any CPU
-		{81F1D47F-F892-45FB-9E35-D7775805FFD3}.Release|x64.Build.0 = Release|Any CPU
-		{81F1D47F-F892-45FB-9E35-D7775805FFD3}.Release|x86.ActiveCfg = Release|Any CPU
-		{81F1D47F-F892-45FB-9E35-D7775805FFD3}.Release|x86.Build.0 = Release|Any CPU
 		{E50071B2-A59F-4FB7-A435-5D966C538DDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E50071B2-A59F-4FB7-A435-5D966C538DDD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E50071B2-A59F-4FB7-A435-5D966C538DDD}.Debug|x64.ActiveCfg = Debug|Any CPU

DeepDrftManager/Components/Pages/Cms/_Imports.razor

@@ -0,0 +1 @@
+@layout DeepDrftManager.Components.Layout.CmsLayout

DeepDrftManager/Components/Pages/Tracks/TrackEdit.razor

@@ -1,7 +1,6 @@
 @page "/cms/tracks/{Id:int}"
 @using AuthBlocksWeb.HierarchicalAuthorize
 @using AuthBlocksWeb.Services
-@using DeepDrftData
 @using System.Net.Http.Headers
 @using System.Net.Http.Json
 @attribute [HierarchicalRoleAuthorize("Admin")]

DeepDrftManager/Components/Pages/Tracks/TrackList.razor

@@ -2,7 +2,6 @@
 @using System.Net
 @using System.Net.Http.Headers
 @using AuthBlocksWeb.HierarchicalAuthorize
-@using Models.Common
 @attribute [HierarchicalRoleAuthorize("Admin")]
 @inject ITrackService TrackService
 @inject IHttpClientFactory HttpClientFactory

DeepDrftManager/Components/Pages/Tracks/TrackNew.razor

@@ -1,8 +1,6 @@
 @page "/cms/tracks/new"
 @using System.Net.Http.Headers
 @using AuthBlocksWeb.HierarchicalAuthorize
-@using Microsoft.AspNetCore.Components.Forms
-@using Microsoft.Extensions.Logging
 @attribute [HierarchicalRoleAuthorize("Admin")]
 
 @inject IHttpClientFactory HttpClientFactory

DeepDrftManager/Components/Pages/Tracks/_Imports.razor

@@ -0,0 +1 @@
+@layout DeepDrftManager.Components.Layout.CmsLayout

DeepDrftManager/Components/Routes.razor

@@ -1,5 +1,5 @@
 <Router AppAssembly="typeof(App).Assembly"
-        AdditionalAssemblies="new[] { typeof(DeepDrftCms._Imports).Assembly, typeof(AuthBlocksWeb._Imports).Assembly }">
+        AdditionalAssemblies="new[] { typeof(AuthBlocksWeb._Imports).Assembly }">
     <Found Context="routeData">
         <AuthorizeRouteView RouteData="routeData">
             <NotAuthorized>

DeepDrftManager/Components/_Imports.razor

@@ -1,9 +1,16 @@
 @using Microsoft.AspNetCore.Authorization
 @using Microsoft.AspNetCore.Components.Authorization
+@using Microsoft.AspNetCore.Components.Forms
 @using Microsoft.AspNetCore.Components.Routing
 @using Microsoft.AspNetCore.Components.Web
+@using Microsoft.AspNetCore.Components.Web.Virtualization
 @using static Microsoft.AspNetCore.Components.Web.RenderMode
+@using Microsoft.Extensions.Logging
+@using Microsoft.JSInterop
 @using MudBlazor
 @using AuthBlocksWeb.Components
 @using DeepDrftManager
 @using DeepDrftManager.Components
+@using DeepDrftModels.Entities
+@using DeepDrftData
+@using Models.Common

DeepDrftManager/DeepDrftManager.csproj

@@ -17,7 +17,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\DeepDrftCms\DeepDrftCms.csproj" />
     <ProjectReference Include="..\DeepDrftData\DeepDrftData.csproj" />
     <ProjectReference Include="..\DeepDrftModels\DeepDrftModels.csproj" />
     <ProjectReference Include="..\DeepDrftShared.Client\DeepDrftShared.Client.csproj" />

DeepDrftManager/Program.cs

@@ -1,6 +1,5 @@
 using AuthBlocksLib;
 using AuthBlocksLib.Options;
-using DeepDrftCms;
 using DeepDrftData;
 using DeepDrftData.Data;
 using DeepDrftData.Repositories;
@@ -31,9 +30,6 @@ builder.Configuration.AddJsonFile(authBlocksPath, optional: false, reloadOnChang
 // MudBlazor.
 builder.Services.AddMudServices();
 
-// CMS-specific services (currently a no-op placeholder; reserved for future RCL additions).
-builder.Services.AddCmsServices();
-
 // SQL metadata domain — DbContext + repository + manager. The CMS pages inject ITrackService
 // and resolve the same scoped TrackManager instance, so the DTO and entity surfaces share state.
 builder.Services.AddDbContext<DeepDrftContext>(options =>
@@ -174,9 +170,7 @@ app.MapControllers();
 
 app.MapRazorComponents<App>()
     .AddInteractiveServerRenderMode()
-    .AddAdditionalAssemblies(
+    .AddAdditionalAssemblies(typeof(AuthBlocksWeb._Imports).Assembly);
-        typeof(DeepDrftCms._Imports).Assembly,
-        typeof(AuthBlocksWeb._Imports).Assembly);
 
 app.Run();