wip: in-progress eform theme work + ThemeVariant plumbing pre-consolidation

Snapshot before starting M3 token consolidation on a fresh branch.
Includes:
- Backend ThemeVariant plumbing (AppearanceSettings POCO, Program.cs
  seeding, CmsService + SettingsService read/write, AdminSettingsModel
  + CmsPublicConfigModel fields).
- Frontend state plumbing (cms actions/effects/reducer/selectors with
  themeVariant, models, app.component.ts theme-class subscription).
- Admin settings theme picker UI (cards at the bottom of the page).
- In-progress eform parity SCSS (token additions, dropdown/nav/button
  pixel-match work) — superseded by the consolidation branch but kept
  cherry-pickable.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: renemadsen

eFormAPI/eFormAPI.Web/Infrastructure/Models/Cms/CmsPublicConfigModel.cs

@@ -24,4 +24,5 @@ public class CmsPublicConfigModel
 {
     public bool IsCmsEnabled { get; set; }
     public bool IsMenuSticky { get; set; }
+    public string ThemeVariant { get; set; } = "eform";
 }

eFormAPI/eFormAPI.Web/Infrastructure/Models/Settings/Admin/AdminSettingsModel.cs

@@ -34,4 +34,5 @@ public class AdminSettingsModel
     public SendGridSettingsModel SendGridSettingsModel { get; set; }
     public string SiteLink { get; set; }
     public string AssemblyVersion { get; set; }
+    public string ThemeVariant { get; set; } = "eform";
 }

eFormAPI/eFormAPI.Web/Infrastructure/Models/Settings/Admin/AppearanceSettings.cs

@@ -0,0 +1,6 @@
+namespace eFormAPI.Web.Infrastructure.Models.Settings.Admin;
+
+public class AppearanceSettings
+{
+    public string ThemeVariant { get; set; } = "eform";
+}

eFormAPI/eFormAPI.Web/Program.cs

@@ -272,6 +272,30 @@ public static void MigrateDb(IHost host)
                 var logger = scope.ServiceProvider.GetRequiredService<ILogger<Program>>();
                 logger.LogError(e, "Error while adding missing admin settings to all menu items");
             }
+
+            try
+            {
+                var connectionStrings =
+                    scope.ServiceProvider.GetRequiredService<IOptions<ConnectionStrings>>();
+                if (connectionStrings.Value.DefaultConnection != "...")
+                {
+                    const string key = "AppearanceSettings:ThemeVariant";
+                    if (!dbContext.ConfigurationValues.Any(x => x.Id == key))
+                    {
+                        dbContext.ConfigurationValues.Add(new Microting.EformAngularFrontendBase.Infrastructure.Data.Entities.EformConfigurationValue
+                        {
+                            Id = key,
+                            Value = "eform"
+                        });
+                        dbContext.SaveChanges();
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                var logger = scope.ServiceProvider.GetRequiredService<ILogger<Program>>();
+                logger.LogError(e, "Error while seeding AppearanceSettings:ThemeVariant");
+            }
         }
     }
 

eFormAPI/eFormAPI.Web/Services/CmsService.cs

@@ -25,7 +25,9 @@ namespace eFormAPI.Web.Services;
 using System.Linq;
 using System.Threading.Tasks;
 using Abstractions;
+using Hosting.Helpers.DbOptions;
 using Infrastructure.Models.Cms;
+using Infrastructure.Models.Settings.Admin;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using Microting.EformAngularFrontendBase.Infrastructure.Data;
@@ -34,6 +36,7 @@ namespace eFormAPI.Web.Services;
 
 public class CmsService(
     ILogger<CmsService> logger,
+    IDbOptions<AppearanceSettings> appearanceSettings,
     BaseDbContext dbContext) : ICmsService
 {
     // ── Pages ────────────────────────────────────────────────────────────────
@@ -351,7 +354,10 @@ public async Task<OperationDataResult<CmsPublicConfigModel>> GetPublicConfig()
             return new OperationDataResult<CmsPublicConfigModel>(true, new CmsPublicConfigModel
             {
                 IsCmsEnabled = settings?.IsCmsEnabled ?? false,
-                IsMenuSticky = settings?.IsMenuSticky ?? false
+                IsMenuSticky = settings?.IsMenuSticky ?? false,
+                ThemeVariant = string.IsNullOrEmpty(appearanceSettings.Value.ThemeVariant)
+                    ? "eform"
+                    : appearanceSettings.Value.ThemeVariant
             });
         }
         catch (Exception ex)

eFormAPI/eFormAPI.Web/Services/SettingsService.cs

@@ -60,6 +60,7 @@ public class SettingsService(
     IDbOptions<ApplicationSettings> applicationSettings,
     IDbOptions<LoginPageSettings> loginPageSettings,
     IDbOptions<HeaderSettings> headerSettings,
+    IDbOptions<AppearanceSettings> appearanceSettings,
     IDbOptions<EmailSettings> emailSettings,
     IEFormCoreService coreHelper,
     ILocalizationService localizationService,
@@ -435,7 +436,10 @@ public async Task<OperationDataResult<AdminSettingsModel>> GetAdminSettings()
                     HttpServerAddress = await core.GetSdkSetting(Settings.httpServerAddress)
                 },
                 SiteLink = await core.GetSdkSetting(Settings.httpServerAddress),
-                AssemblyVersion = Assembly.GetExecutingAssembly().GetName().Version.ToString()
+                AssemblyVersion = Assembly.GetExecutingAssembly().GetName().Version.ToString(),
+                ThemeVariant = string.IsNullOrEmpty(appearanceSettings.Value.ThemeVariant)
+                    ? "eform"
+                    : appearanceSettings.Value.ThemeVariant
             };
             return new OperationDataResult<AdminSettingsModel>(true, model);
         }
@@ -497,6 +501,14 @@ await loginPageSettings.UpdateDb(option =>
                 await core.SetSdkSetting(Settings.httpServerAddress, adminSettingsModel.SiteLink);
             }
 
+            if (!string.IsNullOrEmpty(adminSettingsModel.ThemeVariant))
+            {
+                await appearanceSettings.UpdateDb(option =>
+                {
+                    option.ThemeVariant = adminSettingsModel.ThemeVariant;
+                }, dbContext);
+            }
+
             // if (adminSettingsModel.SwiftSettingsModel != null)
             // {
             //     await core.SetSdkSetting(

eFormAPI/eFormAPI.Web/Startup.cs

@@ -241,6 +241,8 @@ public void ConfigureServices(IServiceCollection services)
         services.ConfigureDbOptions<EmailSettings>(Configuration.GetSection("EmailSettings"));
         services.ConfigureDbOptions<LoginPageSettings>(Configuration.GetSection("LoginPageSettings"));
         services.ConfigureDbOptions<HeaderSettings>(Configuration.GetSection("HeaderSettings"));
+        services.ConfigureDbOptions<eFormAPI.Web.Infrastructure.Models.Settings.Admin.AppearanceSettings>(
+            Configuration.GetSection("AppearanceSettings"));
         var configurationSection = Configuration.GetSection("ConnectionStringsSdk");
         if (Configuration.MyConnectionString().Contains("127.0.0.1"))
         {

eform-client/src/app/common/models/cms/cms.models.ts

@@ -1,6 +1,7 @@
 export interface CmsPublicConfigModel {
   isCmsEnabled: boolean;
   isMenuSticky: boolean;
+  themeVariant?: 'eform' | 'workspace';
 }
 
 export interface CmsMenuItemModel {

eform-client/src/app/common/models/settings/admin/admin-settings.model.ts

@@ -18,6 +18,7 @@ export class AdminSettingsModel {
   sdkSettingsModel: SdkSettingsModel;
   siteLink: string;
   assemblyVersion: string;
+  themeVariant: 'eform' | 'workspace' = 'eform';
 
   constructor() {
     this.loginPageSettingsModel = new LoginPageSettingsModel();

eform-client/src/app/components/app.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnDestroy, OnInit, inject } from '@angular/core';
+import { Component, OnDestroy, OnInit, Renderer2, inject } from '@angular/core';
 import {Title} from '@angular/platform-browser';
 import {AuthService, TitleService, UserSettingsService} from 'src/app/common/services';
 import {Router} from '@angular/router';
@@ -9,6 +9,7 @@ import {
   AuthSyncStorageService,
   updateUserInfo,
 } from 'src/app/state';
+import {loadCmsConfig, selectCmsThemeVariant} from 'src/app/state/cms';
 import {AuthStateService} from 'src/app/common/store';
 import {TranslateService} from '@ngx-translate/core';
 
@@ -27,11 +28,17 @@ export class AppComponent implements OnInit, OnDestroy {
   private ngTitle = inject(Title);
   private titleService = inject(TitleService);
   private authSyncStorageService = inject(AuthSyncStorageService);
+  private renderer = inject(Renderer2);
 
   public selectIsAuth$ = this.authStore.select(selectAuthIsAuth);
+  private selectCmsThemeVariant$ = this.authStore.select(selectCmsThemeVariant);
 
   ngOnInit(): void {
     this.authSyncStorageService.init();
+    this.authStore.dispatch(loadCmsConfig());
+    this.selectCmsThemeVariant$.subscribe((variant) => {
+      this.applyThemeVariant(variant ?? 'eform');
+    });
     this.selectIsAuth$.pipe(debounceTime(1000), take(1)).subscribe((isAuth) => {
       if (isAuth) {
         zip(this.userSettings.getUserSettings(), this.service.obtainUserClaims())
@@ -70,6 +77,13 @@ export class AppComponent implements OnInit, OnDestroy {
     });
   }
 
+  private applyThemeVariant(variant: 'eform' | 'workspace') {
+    const body = document.body;
+    this.renderer.removeClass(body, 'theme-eform');
+    this.renderer.removeClass(body, 'theme-workspace');
+    this.renderer.addClass(body, `theme-${variant}`);
+  }
+
   ngOnDestroy(): void {
   }
 }