diff --git a/DeepDrftCms/CmsStartup.cs b/DeepDrftCms/CmsStartup.cs deleted file mode 100644 index 7409739..0000000 --- a/DeepDrftCms/CmsStartup.cs +++ /dev/null @@ -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; - } -} diff --git a/DeepDrftCms/DeepDrftCms.csproj b/DeepDrftCms/DeepDrftCms.csproj deleted file mode 100644 index c28e329..0000000 --- a/DeepDrftCms/DeepDrftCms.csproj +++ /dev/null @@ -1,28 +0,0 @@ - - - - net10.0 - enable - enable - - - - - - - - - - - - - - - - - - - - - - diff --git a/DeepDrftCms/_Imports.razor b/DeepDrftCms/_Imports.razor deleted file mode 100644 index 91228ec..0000000 --- a/DeepDrftCms/_Imports.razor +++ /dev/null @@ -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 diff --git a/DeepDrftHome.sln b/DeepDrftHome.sln index 6ccc756..65c1e7a 100644 --- a/DeepDrftHome.sln +++ b/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 diff --git a/DeepDrftCms/Components/DeleteTrackDialog.razor b/DeepDrftManager/Components/DeleteTrackDialog.razor similarity index 100% rename from DeepDrftCms/Components/DeleteTrackDialog.razor rename to DeepDrftManager/Components/DeleteTrackDialog.razor diff --git a/DeepDrftCms/Layout/CmsLayout.razor b/DeepDrftManager/Components/Layout/CmsLayout.razor similarity index 100% rename from DeepDrftCms/Layout/CmsLayout.razor rename to DeepDrftManager/Components/Layout/CmsLayout.razor diff --git a/DeepDrftCms/Pages/Cms/Index.razor b/DeepDrftManager/Components/Pages/Cms/Index.razor similarity index 100% rename from DeepDrftCms/Pages/Cms/Index.razor rename to DeepDrftManager/Components/Pages/Cms/Index.razor diff --git a/DeepDrftManager/Components/Pages/Cms/_Imports.razor b/DeepDrftManager/Components/Pages/Cms/_Imports.razor new file mode 100644 index 0000000..24cf4a5 --- /dev/null +++ b/DeepDrftManager/Components/Pages/Cms/_Imports.razor @@ -0,0 +1 @@ +@layout DeepDrftManager.Components.Layout.CmsLayout diff --git a/DeepDrftCms/Pages/Tracks/TrackEdit.razor b/DeepDrftManager/Components/Pages/Tracks/TrackEdit.razor similarity index 100% rename from DeepDrftCms/Pages/Tracks/TrackEdit.razor rename to DeepDrftManager/Components/Pages/Tracks/TrackEdit.razor diff --git a/DeepDrftCms/Pages/Tracks/TrackList.razor b/DeepDrftManager/Components/Pages/Tracks/TrackList.razor similarity index 100% rename from DeepDrftCms/Pages/Tracks/TrackList.razor rename to DeepDrftManager/Components/Pages/Tracks/TrackList.razor diff --git a/DeepDrftCms/Pages/Tracks/TrackNew.razor b/DeepDrftManager/Components/Pages/Tracks/TrackNew.razor similarity index 100% rename from DeepDrftCms/Pages/Tracks/TrackNew.razor rename to DeepDrftManager/Components/Pages/Tracks/TrackNew.razor diff --git a/DeepDrftManager/Components/Pages/Tracks/_Imports.razor b/DeepDrftManager/Components/Pages/Tracks/_Imports.razor new file mode 100644 index 0000000..24cf4a5 --- /dev/null +++ b/DeepDrftManager/Components/Pages/Tracks/_Imports.razor @@ -0,0 +1 @@ +@layout DeepDrftManager.Components.Layout.CmsLayout diff --git a/DeepDrftManager/Components/Routes.razor b/DeepDrftManager/Components/Routes.razor index 5fc7f1b..a5d2f07 100644 --- a/DeepDrftManager/Components/Routes.razor +++ b/DeepDrftManager/Components/Routes.razor @@ -1,5 +1,5 @@ + AdditionalAssemblies="new[] { typeof(AuthBlocksWeb._Imports).Assembly }"> diff --git a/DeepDrftManager/Components/_Imports.razor b/DeepDrftManager/Components/_Imports.razor index 36e7ead..d3c559c 100644 --- a/DeepDrftManager/Components/_Imports.razor +++ b/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 diff --git a/DeepDrftManager/DeepDrftManager.csproj b/DeepDrftManager/DeepDrftManager.csproj index ddf6c5a..ae9d350 100644 --- a/DeepDrftManager/DeepDrftManager.csproj +++ b/DeepDrftManager/DeepDrftManager.csproj @@ -17,7 +17,6 @@ - diff --git a/DeepDrftManager/Program.cs b/DeepDrftManager/Program.cs index 54d66bf..347d9ee 100644 --- a/DeepDrftManager/Program.cs +++ b/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(options => @@ -174,9 +170,7 @@ app.MapControllers(); app.MapRazorComponents() .AddInteractiveServerRenderMode() - .AddAdditionalAssemblies( - typeof(DeepDrftCms._Imports).Assembly, - typeof(AuthBlocksWeb._Imports).Assembly); + .AddAdditionalAssemblies(typeof(AuthBlocksWeb._Imports).Assembly); app.Run();