Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
feat: add development/beta version branding
Kyle Mendell2158fe7da7d4
diff --git a/.golangci.yml b/.golangci.ymlindex 16205e648..019fe6afd 100644--- a/.golangci.yml+++ b/.golangci.yml@@ -1,8 +1,8 @@# Slightly Modified Version of docker's golangci lint configuration to fit arcanes standards-version: "2"+version: '2'run:- go: "1.27.2"+ go: '1.27.2'build-tags:- exclude_frontend- playwright@@ -78,20 +78,20 @@ linters:desc: use stdlib maps package- pkg: golang.org/x/exp/slicesdesc: use stdlib slices package- - pkg: "github.com/google/uuid"+ - pkg: 'github.com/google/uuid'desc: Use stdlib uuid instead.- - pkg: "gopkg.in/yaml.v3"+ - pkg: 'gopkg.in/yaml.v3'desc: Use go.yaml.in/yaml/v4 instead.forbidigo:analyze-types: trueforbid:- pattern: 'context\.Background'- pkg: "^context$"- msg: "in tests, use t.Context() instead of context.Background()"+ pkg: '^context$'+ msg: 'in tests, use t.Context() instead of context.Background()'- pattern: 'context\.TODO'- pkg: "^context$"- msg: "in tests, use t.Context() instead of context.TODO()"+ pkg: '^context$'+ msg: 'in tests, use t.Context() instead of context.TODO()'gocritic:disabled-checks:@@ -142,7 +142,7 @@ linters:disabled: truesloglint:- context: "all" # https://github.com/go-simpler/sloglint#context-only+ context: 'all' # https://github.com/go-simpler/sloglint#context-onlykv-only: true # https://github.com/go-simpler/sloglint#key-value-pairs-onlystatic-msg: true # https://github.com/go-simpler/sloglint#static-messagekey-naming-case: cameldiff --git a/backend/internal/appimages/handler.go b/backend/internal/appimages/handler.goindex bd865ed11..c97b4ca8b 100644--- a/backend/internal/appimages/handler.go+++ b/backend/internal/appimages/handler.go@@ -50,40 +50,31 @@ func (h *AppImagesHandler) GetLogo(ctx context.Context, input *GetLogoInput) (*Gname += "-animated"}- return h.getImageWithColor(name, input.Color, input.Loop && name == "logo-animated")+ return h.getImageWithColor(name, input.Color, input.Loop)}// GetLogoEmail returns the application logo image for emails (PNG).func (h *AppImagesHandler) GetLogoEmail(ctx context.Context, input *struct{}) (*GetAppImageOutput, error) {- return h.getImage("logo-email")+ return h.getImageWithColor("logo-email", "", false)}// GetFavicon returns the application favicon image.func (h *AppImagesHandler) GetFavicon(ctx context.Context, input *struct{}) (*GetAppImageOutput, error) {- return h.getImage("favicon")+ return h.getImageWithColor("favicon", "", false)}// GetDefaultProfile returns the default user profile image.func (h *AppImagesHandler) GetDefaultProfile(ctx context.Context, input *struct{}) (*GetAppImageOutput, error) {- return h.getImage("profile")+ return h.getImageWithColor("profile", "", false)}// GetPWAIcon returns a PWA icon image.func (h *AppImagesHandler) GetPWAIcon(ctx context.Context, input *GetPWAIconInput) (*GetAppImageOutput, error) {- return h.getImageByFilenameInternal(input.Filename)-}--func (h *AppImagesHandler) getImage(name string) (*GetAppImageOutput, error) {- return h.getImageWithColor(name, "", false)-}--func (h *AppImagesHandler) getImageByFilenameInternal(filename string) (*GetAppImageOutput, error) {- if _, ok := allowedPWAIconFilenames[filename]; !ok {+ if _, ok := allowedPWAIconFilenames[input.Filename]; !ok {return nil, huma.Error400BadRequest("invalid PWA icon filename")}- name := strings.TrimSuffix(filename, filepath.Ext(filename))- return h.getImage(name)+ return h.getImageWithColor(strings.TrimSuffix(input.Filename, filepath.Ext(input.Filename)), "", false)}func (h *AppImagesHandler) getImageWithColor(name, colorOverride string, loop bool) (*GetAppImageOutput, error) {@@ -92,10 +83,11 @@ func (h *AppImagesHandler) getImageWithColor(name, colorOverride string, loop boreturn nil, huma.Error500InternalServerError("Failed to retrieve image: " + err.Error())}- // Always disable logo caching so theme/logo updates are reflected immediately.- // Keep cache for static app images that do not change at runtime.+ // Disable branding caching so theme and build-channel artwork is reflected immediately.+ _, isPWAIcon := allowedPWAIconFilenames[name+".png"]+ isBranding := IsLogoVariant(name) || isPWAIcon || name == "logo-email" || name == "favicon"cacheControl := kit.Ternary(- IsLogoVariant(name) || colorOverride != "",+ isBranding || colorOverride != "","no-cache, no-store, must-revalidate","public, max-age=900, stale-while-revalidate=86400",)diff --git a/backend/internal/appimages/helpers.go b/backend/internal/appimages/helpers.gonew file mode 100644index 000000000..86feb3321--- /dev/null+++ b/backend/internal/appimages/helpers.go@@ -0,0 +1,12 @@+package appimages++import (+ "go.getarcane.app/kit/pkg"+ "golang.org/x/mod/semver"+)++// isStableVersion reports whether version is a semver release without a prerelease suffix.+func isStableVersion(version string) bool {+ v := kit.EnsurePrefix(version, "v")+ return semver.IsValid(v) && semver.Prerelease(v) == ""+}diff --git a/backend/internal/appimages/helpers_test.go b/backend/internal/appimages/helpers_test.gonew file mode 100644index 000000000..d97769dd6--- /dev/null+++ b/backend/internal/appimages/helpers_test.go@@ -0,0 +1,32 @@+package appimages++import (+ "testing"++ "github.com/stretchr/testify/assert"+)++func TestIsStableVersion(t *testing.T) {+ tests := []struct {+ version string+ stable bool+ }{+ {"1.2.3", true},+ {"v1.2.3", true},+ {" 1.2.3 ", true},+ {"1.2.3+build.5", true},+ {"1.2.3-next.4", false},+ {"v1.2.3-rc.1", false},+ {"1.2.3-beta", false},+ {"next", false},+ {"dev", false},+ {"snapshot-abc123", false},+ {"", false},+ }++ for _, tt := range tests {+ t.Run(tt.version, func(t *testing.T) {+ assert.Equal(t, tt.stable, isStableVersion(tt.version))+ })+ }+}diff --git a/backend/internal/appimages/service.go b/backend/internal/appimages/service.goindex 78c87bbdf..9df488428 100644--- a/backend/internal/appimages/service.go+++ b/backend/internal/appimages/service.go@@ -4,85 +4,98 @@ import ("embed""fmt""io/fs"+ "path""path/filepath""strings"- "sync"settingstypes "github.com/getarcaneapp/arcane/types/v2/settings""go.getarcane.app/kit/pkg"+ "github.com/getarcaneapp/arcane/backend/v2/internal/config""github.com/getarcaneapp/arcane/backend/v2/internal/settings")+type appImage struct {+ data []byte+ mimeType string+}+type ApplicationImagesService struct {- mu sync.RWMutex- imageData map[string][]byte- mimeTypes map[string]string+ standard map[string]appImage+ development map[string]appImagesettingsService *settings.SettingsService}func NewApplicationImagesService(embeddedFS embed.FS, settingsService *settings.SettingsService) *ApplicationImagesService {service := &ApplicationImagesService{- imageData: make(map[string][]byte),- mimeTypes: make(map[string]string),+ standard: make(map[string]appImage),+ development: make(map[string]appImage),settingsService: settingsService,}- imageDir := "images"- entries, err := fs.ReadDir(embeddedFS, imageDir)- if err != nil {- return service+ // Only non-stable builds load the development artwork; its 512px icon also replaces the standalone marks.+ sets := map[string]map[string]appImage{"images": service.standard}+ if !isStableVersion(config.Version) {+ sets["images/development"] = service.development}+ aliases := map[string][]string{"images/development/icon-512x512": {"logo", "logo-animated"}}- for _, entry := range entries {- if entry.IsDir() {- continue- }-- filename := entry.Name()- ext := strings.ToLower(filepath.Ext(filename))- nameWithoutExt := strings.TrimSuffix(filename, ext)-- data, readFileErr := embeddedFS.ReadFile(filepath.Join(imageDir, filename))- if readFileErr != nil {+ for dir, images := range sets {+ entries, err := fs.ReadDir(embeddedFS, dir)+ if err != nil {continue}- extWithoutDot := strings.TrimPrefix(ext, ".")- mimeType := kit.GetImageMimeType(extWithoutDot)- if mimeType == "" {- continue+ for _, entry := range entries {+ filename := entry.Name()+ ext := strings.ToLower(filepath.Ext(filename))+ mimeType := kit.GetImageMimeType(strings.TrimPrefix(ext, "."))+ if entry.IsDir() || mimeType == "" {+ continue+ }++ data, readErr := embeddedFS.ReadFile(path.Join(dir, filename))+ if readErr != nil {+ continue+ }++ name := strings.TrimSuffix(filename, ext)+ for _, key := range append([]string{name}, aliases[path.Join(dir, name)]...) {+ images[key] = appImage{data: data, mimeType: mimeType}+ }}-- service.imageData[nameWithoutExt] = data- service.mimeTypes[nameWithoutExt] = mimeType}return service}func (s *ApplicationImagesService) GetImageWithColor(name, colorOverride string, loop bool) ([]byte, string, error) {- s.mu.RLock()- data, ok := s.imageData[name]- mimeType := s.mimeTypes[name]- s.mu.RUnlock()-+ img, ok := s.standard[name]+ if dev, hasDev := s.development[name]; hasDev && s.settingsService.GetSettingsConfig().DevelopmentBrandingEnabled.IsTrue() {+ img, ok = dev, true+ }if !ok {return nil, "", fmt.Errorf("image '%s' not found", name)}- // Apply dynamic color replacement for logo SVGs- if IsLogoVariant(name) && mimeType == "image/svg+xml" {- data = s.applyAccentColorToSVGInternal(data, colorOverride)+ data, mimeType := img.data, img.mimeType+ if !IsLogoVariant(name) || mimeType != "image/svg+xml" {+ return data, mimeType, nil}- // The animated mark ships both a one-shot and a looping keyframe set; loop- // mode swaps the animation shorthand so the trace repeats indefinitely.+ accentColor := kit.Ternary(settingstypes.SafeAccentColor.MatchString(colorOverride), colorOverride, settingstypes.DefaultAccentColor)+ svg := strings.NewReplacer(+ "fill:#6D28D9", "fill:"+accentColor,+ "fill:#6d28d9", "fill:"+accentColor,+ "stroke:#6D28D9", "stroke:"+accentColor,+ "stroke:#6d28d9", "stroke:"+accentColor,+ ).Replace(string(data))++ // Loop mode swaps the animated mark's one-shot trace for its looping keyframes.if loop && name == "logo-animated" {- data = []byte(strings.Replace(string(data),- "animation: traceDraw 1.7s ease both;",- "animation: traceDrawLoop 2.6s ease infinite;", 1))+ svg = strings.Replace(svg, "animation: traceDraw 1.7s ease both;", "animation: traceDrawLoop 2.6s ease infinite;", 1)}+ data = []byte(svg)return data, mimeType, nil}@@ -95,17 +108,3 @@ func IsLogoVariant(name string) bool {}return false}--func (s *ApplicationImagesService) applyAccentColorToSVGInternal(svgData []byte, colorOverride string) []byte {- accentColor := settingstypes.DefaultAccentColor- if settingstypes.SafeAccentColor.MatchString(colorOverride) {- accentColor = colorOverride- }-- svgStr := string(svgData)- svgStr = strings.ReplaceAll(svgStr, "fill:#6D28D9", "fill:"+accentColor)- svgStr = strings.ReplaceAll(svgStr, "fill:#6d28d9", "fill:"+accentColor)- svgStr = strings.ReplaceAll(svgStr, "stroke:#6D28D9", "stroke:"+accentColor)- svgStr = strings.ReplaceAll(svgStr, "stroke:#6d28d9", "stroke:"+accentColor)- return []byte(svgStr)-}diff --git a/backend/internal/appimages/service_test.go b/backend/internal/appimages/service_test.gonew file mode 100644index 000000000..2661df3e9--- /dev/null+++ b/backend/internal/appimages/service_test.go@@ -0,0 +1,135 @@+package appimages++import (+ "bytes"+ "context"+ "fmt"+ "image/png"+ "testing"++ "github.com/libtnb/sqlite"+ "github.com/stretchr/testify/assert"+ "github.com/stretchr/testify/require"+ "gorm.io/gorm"++ "github.com/getarcaneapp/arcane/backend/v2/internal/config"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database"+ "github.com/getarcaneapp/arcane/backend/v2/internal/settings"+ "github.com/getarcaneapp/arcane/backend/v2/resources"+)++func newServiceForVersion(t *testing.T, version string) (*ApplicationImagesService, *settings.SettingsService) {+ t.Helper()+ original := config.Version+ config.Version = version+ t.Cleanup(func() { config.Version = original })++ gdb, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{})+ require.NoError(t, err)+ require.NoError(t, gdb.AutoMigrate(&settings.SettingVariable{}))+ settingsSvc, err := settings.NewSettingsService(t.Context(), &database.DB{DB: gdb})+ require.NoError(t, err)+ t.Cleanup(func() { require.NoError(t, settingsSvc.Stop(context.WithoutCancel(t.Context()))) })++ return NewApplicationImagesService(resources.FS, settingsSvc), settingsSvc+}++func readEmbedded(t *testing.T, name string) []byte {+ t.Helper()+ data, err := resources.FS.ReadFile(name)+ require.NoError(t, err)+ return data+}++func TestNewApplicationImagesService_StableBuildUsesStandardBranding(t *testing.T) {+ svc, _ := newServiceForVersion(t, "v1.2.3")++ for _, name := range []string{"logo", "logo-animated"} {+ _, mimeType, err := svc.GetImageWithColor(name, "", false)+ require.NoError(t, err)+ assert.Equal(t, "image/svg+xml", mimeType, name)+ }++ data, _, err := svc.GetImageWithColor("favicon", "", false)+ require.NoError(t, err)+ assert.Equal(t, readEmbedded(t, "images/favicon.ico"), data)++ data, _, err = svc.GetImageWithColor("logo-email", "", false)+ require.NoError(t, err)+ assert.Equal(t, readEmbedded(t, "images/logo-email.png"), data)+}++func TestNewApplicationImagesService_NonStableBuildUsesDevelopmentBranding(t *testing.T) {+ svc, _ := newServiceForVersion(t, "1.2.3-next.1")+ mark := readEmbedded(t, "images/development/icon-512x512.png")++ for _, tc := range []struct {+ name string+ color string+ loop bool+ }{+ {"logo", "", false},+ {"logo", "#ff0000", false},+ {"logo-animated", "", false},+ {"logo-animated", "#ff0000", true},+ } {+ data, mimeType, err := svc.GetImageWithColor(tc.name, tc.color, tc.loop)+ require.NoError(t, err)+ assert.Equal(t, "image/png", mimeType, tc.name)+ assert.Equal(t, mark, data, tc.name)+ }++ for _, name := range []string{"logo-full", "logo-full-animated"} {+ data, mimeType, err := svc.GetImageWithColor(name, "#ff0000", false)+ require.NoError(t, err)+ assert.Equal(t, "image/svg+xml", mimeType, name)+ assert.Contains(t, string(data), "#ff0000", name)+ }++ data, mimeType, err := svc.GetImageWithColor("favicon", "", false)+ require.NoError(t, err)+ assert.Equal(t, readEmbedded(t, "images/development/favicon.ico"), data)+ assert.Equal(t, []byte{0, 0, 1, 0}, data[:4])+ assert.NotEmpty(t, mimeType)++ data, mimeType, err = svc.GetImageWithColor("logo-email", "", false)+ require.NoError(t, err)+ assert.Equal(t, "image/png", mimeType)+ assert.Equal(t, readEmbedded(t, "images/development/logo-email.png"), data)++ data, _, err = svc.GetImageWithColor("profile", "", false)+ require.NoError(t, err)+ assert.Equal(t, readEmbedded(t, "images/profile.webp"), data)++ for _, size := range []int{72, 96, 128, 144, 152, 192, 384, 512} {+ name := fmt.Sprintf("icon-%dx%d", size, size)+ icon, iconMimeType, iconErr := svc.GetImageWithColor(name, "", false)+ require.NoError(t, iconErr)+ assert.Equal(t, "image/png", iconMimeType, name)+ assert.Equal(t, readEmbedded(t, "images/development/"+name+".png"), icon, name)++ cfg, decodeErr := png.DecodeConfig(bytes.NewReader(icon))+ require.NoError(t, decodeErr)+ assert.Equal(t, size, cfg.Width, name)+ assert.Equal(t, size, cfg.Height, name)+ }+}++func TestGetImageWithColor_DevelopmentBrandingDisabledUsesStandardBranding(t *testing.T) {+ svc, settingsSvc := newServiceForVersion(t, "dev")+ require.NoError(t, settingsSvc.SetBoolSetting(t.Context(), "developmentBrandingEnabled", false))++ _, mimeType, err := svc.GetImageWithColor("logo", "", false)+ require.NoError(t, err)+ assert.Equal(t, "image/svg+xml", mimeType)++ for name, file := range map[string]string{+ "favicon": "images/favicon.ico",+ "logo-email": "images/logo-email.png",+ "icon-192x192": "images/icon-192x192.png",+ } {+ data, _, getErr := svc.GetImageWithColor(name, "", false)+ require.NoError(t, getErr)+ assert.Equal(t, readEmbedded(t, file), data, name)+ }+}diff --git a/backend/internal/config/schema/schema_test.go b/backend/internal/config/schema/schema_test.goindex 5d3d54134..50af14d84 100644--- a/backend/internal/config/schema/schema_test.go+++ b/backend/internal/config/schema/schema_test.go@@ -299,6 +299,7 @@ var expectedSettingOverrideKeys = []string{"deployWaitTimeout","depotProjectId","depotToken",+ "developmentBrandingEnabled","diskUsagePath","dockerApiTimeout","dockerClientRefreshInterval",diff --git a/backend/internal/settings/model.go b/backend/internal/settings/model.goindex 2b7e070ff..66a945b40 100644--- a/backend/internal/settings/model.go+++ b/backend/internal/settings/model.go@@ -74,6 +74,7 @@ type Settings struct {AvatarMaxUploadSizeMb SettingVariable `key:"avatarMaxUploadSizeMb,authrequired" meta:"label=Avatar Max Upload Size (MB);type=number;keywords=avatar,profile,picture,upload,size,limit,maximum,image,user,photo,mb;category=users;description=Maximum size in MB for profile picture uploads (default: 2)"`DefaultShell SettingVariable `key:"defaultShell" meta:"label=Default Shell;type=text;keywords=shell,default,shellpath,path,login;category=general;description=Default shell to use for commands"`ExperimentalFeaturesEnabled SettingVariable `key:"experimentalFeaturesEnabled,authrequired" meta:"label=Experimental Features;type=boolean;keywords=experimental,features,beta,preview,flags;category=general;description=Enable experimental features that may change or be removed in future releases"`+ DevelopmentBrandingEnabled SettingVariable `key:"developmentBrandingEnabled,public" meta:"label=Development Branding;type=boolean;keywords=development,branding,logo,icon,favicon,next,dev,preview,prerelease;category=general;description=Show the development icon instead of the standard Arcane logo on non-stable builds"`EnvironmentHealthInterval SettingVariable `key:"environmentHealthInterval" meta:"label=Environment Health Check Interval;type=cron;keywords=environment,health,check,interval,frequency,heartbeat,status,monitoring,uptime,jobs,schedule;description=How often to check environment connectivity (cron expression)" catmeta:"id=jobschedule;title=Automations;icon=jobs;url=/settings/jobs;description=Configure how often Arcane background jobs run"`// Docker categorydiff --git a/backend/internal/settings/service.go b/backend/internal/settings/service.goindex a8df0d7a7..dc28a73bd 100644--- a/backend/internal/settings/service.go+++ b/backend/internal/settings/service.go@@ -239,6 +239,7 @@ func DefaultSettingsConfig() *Settings {BaseServerURL: SettingVariable{Value: "http://localhost"},EnableGravatar: SettingVariable{Value: "false"},ExperimentalFeaturesEnabled: SettingVariable{Value: "false"},+ DevelopmentBrandingEnabled: SettingVariable{Value: "true"},AvatarMaxUploadSizeMb: SettingVariable{Value: "2"},DefaultShell: SettingVariable{Value: "/bin/sh"},DockerHost: SettingVariable{Value: "unix:///var/run/docker.sock"},diff --git a/backend/resources/images/development/favicon.ico b/backend/resources/images/development/favicon.iconew file mode 100644index 000000000..54e9767c3Binary files /dev/null and b/backend/resources/images/development/favicon.ico differdiff --git a/backend/resources/images/development/icon-128x128.png b/backend/resources/images/development/icon-128x128.pngnew file mode 100644index 000000000..1bd6a8fd5Binary files /dev/null and b/backend/resources/images/development/icon-128x128.png differdiff --git a/backend/resources/images/development/icon-144x144.png b/backend/resources/images/development/icon-144x144.pngnew file mode 100644index 000000000..7316852adBinary files /dev/null and b/backend/resources/images/development/icon-144x144.png differdiff --git a/backend/resources/images/development/icon-152x152.png b/backend/resources/images/development/icon-152x152.pngnew file mode 100644index 000000000..1d50fbcbfBinary files /dev/null and b/backend/resources/images/development/icon-152x152.png differdiff --git a/backend/resources/images/development/icon-192x192.png b/backend/resources/images/development/icon-192x192.pngnew file mode 100644index 000000000..e58e56f93Binary files /dev/null and b/backend/resources/images/development/icon-192x192.png differdiff --git a/backend/resources/images/development/icon-384x384.png b/backend/resources/images/development/icon-384x384.pngnew file mode 100644index 000000000..2427ead66Binary files /dev/null and b/backend/resources/images/development/icon-384x384.png differdiff --git a/backend/resources/images/development/icon-512x512.png b/backend/resources/images/development/icon-512x512.pngnew file mode 100644index 000000000..0a5662ad4Binary files /dev/null and b/backend/resources/images/development/icon-512x512.png differdiff --git a/backend/resources/images/development/icon-72x72.png b/backend/resources/images/development/icon-72x72.pngnew file mode 100644index 000000000..b1cb6bba5Binary files /dev/null and b/backend/resources/images/development/icon-72x72.png differdiff --git a/backend/resources/images/development/icon-96x96.png b/backend/resources/images/development/icon-96x96.pngnew file mode 100644index 000000000..3282b0514Binary files /dev/null and b/backend/resources/images/development/icon-96x96.png differdiff --git a/backend/resources/images/development/logo-email.png b/backend/resources/images/development/logo-email.pngnew file mode 100644index 000000000..fa331bbd8Binary files /dev/null and b/backend/resources/images/development/logo-email.png differdiff --git a/frontend/messages/en.json b/frontend/messages/en.jsonindex 472e45cc8..f170995ea 100644--- a/frontend/messages/en.json+++ b/frontend/messages/en.json@@ -650,6 +650,8 @@"convert_create_message": "This project was generated from existing container(s). The originals keep running unless you remove them — removal happens immediately after creation, before the project is deployed, and cannot be undone.","experimental_features": "Experimental Features","experimental_features_description": "Enable features that may change or be removed in future releases",+ "development_branding": "Development Branding",+ "development_branding_description": "Show the development icon instead of the standard Arcane logo on this build","containers_bulk_start_confirm_title": "Start {count} Container(s)","containers_bulk_start_confirm_message": "Are you sure you want to start {count} container(s)?","containers_bulk_stop_confirm_title": "Stop {count} Container(s)",diff --git a/frontend/src/lib/components/dialogs/version-info-dialog.svelte b/frontend/src/lib/components/dialogs/version-info-dialog.svelteindex 3c7a776e2..72724deca 100644--- a/frontend/src/lib/components/dialogs/version-info-dialog.svelte+++ b/frontend/src/lib/components/dialogs/version-info-dialog.svelte@@ -13,6 +13,7 @@import type { AppVersionInformation, Settings } from '#lib/types/settings.js';import { handleApiResultWithCallbacks } from '#lib/utils/api.js';import { hasPermission } from '#lib/utils/auth.js';+ import { isDevelopmentBuild, usesDevelopmentBranding } from '#lib/utils/branding.js';import { getApplicationLogo } from '#lib/utils/docker.js';import { resolveLogoColor } from '#lib/utils/theme.svelte.js';import { tryCatch } from '#lib/utils/try-catch.js';@@ -44,18 +45,18 @@const enabledFeatures = $derived((displayInfo.enabledFeatures ?? []).filter(Boolean).join(', '));const logoColor = $derived(resolveLogoColor(mode.current === 'dark'));- const logoUrl = $derived(getApplicationLogo(false, logoColor, logoColor));+ const developmentBranding = $derived(usesDevelopmentBranding());+ const logoUrl = $derived(getApplicationLogo(false, logoColor, logoColor, { development: developmentBranding }));- const canToggleExperimental = $derived(hasPermission('settings:write'));- const experimentalEnabled = $derived(settingsStore.current?.experimentalFeaturesEnabled === true);- let savingExperimental = $state(false);+ const canToggleSettings = $derived(hasPermission('settings:write'));+ let savingSetting = $state(false);- async function handleExperimentalToggle(enabled: boolean) {- savingExperimental = true;+ async function updateSetting(update: Partial<Settings>) {+ savingSetting = true;await handleApiResultWithCallbacks<Settings>({- result: await tryCatch(settingsService.updateSettings({ experimentalFeaturesEnabled: enabled })),+ result: await tryCatch(settingsService.updateSettings(update)),message: m.common_update_failed({ resource: m.settings() }),- setLoadingState: (value) => (savingExperimental = value),+ setLoadingState: (value) => (savingSetting = value),onSuccess: async (updated) => {settingsStore.set(updated);toast.success(m.common_update_success({ resource: m.settings() }));@@ -64,10 +65,26 @@}</script>+{#snippet settingToggle(+ id: string,+ label: string,+ description: string,+ checked: boolean,+ onCheckedChange: (enabled: boolean) => void+)}+ <div class="flex items-center justify-between gap-3 border-b border-border/50 py-3 last:border-0">+ <div class="flex flex-col gap-1">+ <span class="text-sm font-medium text-foreground">{label}</span>+ <span class="text-sm text-muted-foreground">{description}</span>+ </div>+ <Switch {id} {checked} disabled={savingSetting} aria-label={label} {onCheckedChange} />+ </div>+{/snippet}+<ResponsiveDialog {open} {onOpenChange} contentClass="sm:max-w-md">{#snippet title()}<div class="flex items-center gap-3">- <img src={logoUrl} alt="Arcane" class="size-7" />+ <img src={logoUrl} alt="Arcane" class={developmentBranding ? 'size-10' : 'size-7'} /><div class="flex flex-col gap-0.5"><span class="text-xl leading-none">{m.version_info_title()}</span><span class="text-sm font-normal text-muted-foreground">{displayInfo.displayVersion || displayInfo.currentVersion}</span>@@ -94,20 +111,23 @@{@render infoRow(m.version_info_build_features(), enabledFeatures || '-')}- {#if canToggleExperimental}- <div class="flex items-center justify-between gap-3 border-b border-border/50 py-3 last:border-0">- <div class="flex flex-col gap-1">- <span class="text-sm font-medium text-foreground">{m.experimental_features()}</span>- <span class="text-sm text-muted-foreground">{m.experimental_features_description()}</span>- </div>- <Switch- id="experimental-features-toggle"- checked={experimentalEnabled}- disabled={savingExperimental}- aria-label={m.experimental_features()}- onCheckedChange={handleExperimentalToggle}- />- </div>+ {#if canToggleSettings}+ {@render settingToggle(+ 'experimental-features-toggle',+ m.experimental_features(),+ m.experimental_features_description(),+ settingsStore.current?.experimentalFeaturesEnabled === true,+ (enabled) => updateSetting({ experimentalFeaturesEnabled: enabled })+ )}+ {#if isDevelopmentBuild()}+ {@render settingToggle(+ 'development-branding-toggle',+ m.development_branding(),+ m.development_branding_description(),+ settingsStore.current?.developmentBrandingEnabled !== false,+ (enabled) => updateSetting({ developmentBrandingEnabled: enabled })+ )}+ {/if}{/if}{#if displayInfo.currentDigest}diff --git a/frontend/src/lib/components/oidc-status-panel.svelte b/frontend/src/lib/components/oidc-status-panel.svelteindex 7f118339a..706867c14 100644--- a/frontend/src/lib/components/oidc-status-panel.svelte+++ b/frontend/src/lib/components/oidc-status-panel.svelte@@ -4,6 +4,7 @@import { m } from '#lib/paraglide/messages.js';import userStore from '#lib/stores/user-store.svelte.js';+ import { usesDevelopmentBranding } from '#lib/utils/branding.js';import { getApplicationLogo } from '#lib/utils/docker.js';import { resolveLogoColor } from '#lib/utils/theme.svelte.js';@@ -20,7 +21,11 @@const logoColor = $derived(resolveLogoColor(mode.current === 'dark'));const animationsEnabled = $derived(userStore.current?.preferences?.animationsEnabled ?? true);const loaderLogoUrl = $derived(- getApplicationLogo(false, logoColor, logoColor, { animated: animationsEnabled, loop: animationsEnabled })+ getApplicationLogo(false, logoColor, logoColor, {+ animated: animationsEnabled,+ loop: animationsEnabled,+ development: usesDevelopmentBranding()+ }));</script>diff --git a/frontend/src/lib/components/sidebar/sidebar-logo.svelte b/frontend/src/lib/components/sidebar/sidebar-logo.svelteindex bea5edb4e..54a3b90e3 100644--- a/frontend/src/lib/components/sidebar/sidebar-logo.svelte+++ b/frontend/src/lib/components/sidebar/sidebar-logo.svelte@@ -4,6 +4,7 @@import { m } from '#lib/paraglide/messages.js';import userStore from '#lib/stores/user-store.svelte.js';import { cn } from '#lib/utils.js';+ import { usesDevelopmentBranding } from '#lib/utils/branding.js';import { getApplicationLogo } from '#lib/utils/docker.js';import { resolveLogoColor } from '#lib/utils/theme.svelte.js';@@ -11,7 +12,12 @@const logoColor = $derived(resolveLogoColor(mode.current === 'dark'));const animationsEnabled = $derived(userStore.current?.preferences?.animationsEnabled ?? true);- const logoUrl = $derived(getApplicationLogo(!isCollapsed, logoColor, logoColor, { animated: animationsEnabled }));+ const developmentBranding = $derived(usesDevelopmentBranding());+ const logoUrl = $derived(+ getApplicationLogo(!isCollapsed, logoColor, logoColor, { animated: animationsEnabled, development: developmentBranding })+ );+ const markSize = $derived(developmentBranding ? 32 : 24);+ const markClass = $derived(markSize === 32 ? 'size-8' : 'size-6');</script><div@@ -24,9 +30,9 @@<imgsrc={logoUrl}alt={m.layout_title()}- class={cn('drop-shadow-sm transition-all duration-300', isCollapsed ? 'h-6 w-6' : 'h-9 w-auto max-w-40')}- width={isCollapsed ? '24' : '160'}- height={isCollapsed ? '24' : '72'}+ class={cn('drop-shadow-sm transition-all duration-300', isCollapsed ? markClass : 'h-9 w-auto max-w-40')}+ width={isCollapsed ? markSize : 160}+ height={isCollapsed ? markSize : 72}/></div></div>diff --git a/frontend/src/lib/types/settings.ts b/frontend/src/lib/types/settings.tsindex 7b0c3fd44..04c5d0d03 100644--- a/frontend/src/lib/types/settings.ts+++ b/frontend/src/lib/types/settings.ts@@ -71,6 +71,7 @@ export type Settings = {enableGravatar: boolean;enableGravatarEnvForced?: boolean;experimentalFeaturesEnabled: boolean;+ developmentBrandingEnabled: boolean;apnsEnabled?: boolean;avatarMaxUploadSizeMb: number;uiConfigDisabled: boolean;diff --git a/frontend/src/lib/utils/branding.ts b/frontend/src/lib/utils/branding.tsnew file mode 100644index 000000000..b3e10993d--- /dev/null+++ b/frontend/src/lib/utils/branding.ts@@ -0,0 +1,13 @@+import settingsStore from '#lib/stores/config-store.svelte.js';+import { versionStore } from '#lib/stores/version.store.svelte.js';++// Mirrors the backend's stable check: plain X.Y.Z, optionally with a v prefix or build metadata.+export function isDevelopmentBuild(): boolean {+ const version = versionStore.current?.currentVersion.trim();+ return !!version && !/^v?\d+\.\d+\.\d+(\+.*)?$/.test(version);+}++// Development builds serve a square tile mark, which needs a larger box than the stable glyph.+export function usesDevelopmentBranding(): boolean {+ return isDevelopmentBuild() && settingsStore.current?.developmentBrandingEnabled !== false;+}diff --git a/frontend/src/lib/utils/docker.ts b/frontend/src/lib/utils/docker.tsindex 6debb68b0..62ca4950f 100644--- a/frontend/src/lib/utils/docker.ts+++ b/frontend/src/lib/utils/docker.ts@@ -354,7 +354,7 @@ export function getApplicationLogo(full = false,colorOverride?: string,version?: string,- opts?: { animated?: boolean; loop?: boolean }+ opts?: { animated?: boolean; loop?: boolean; development?: boolean }): string {const params = new URLSearchParams();@@ -374,6 +374,11 @@ export function getApplicationLogo(params.set('loop', 'true');}+ // Cache-busts open pages when development branding is toggled.+ if (opts?.development) {+ params.set('branding', 'development');+ }+if (version) {params.set('v', version);}diff --git a/frontend/src/lib/utils/settings.svelte.ts b/frontend/src/lib/utils/settings.svelte.tsindex f24d89360..8f8f25499 100644--- a/frontend/src/lib/utils/settings.svelte.ts+++ b/frontend/src/lib/utils/settings.svelte.ts@@ -22,6 +22,7 @@ const LOCAL_SETTING_KEYS = new Set(['oidcProviderLogoUrl','edgeMTLSManagerCAAvailable','experimentalFeaturesEnabled',+ 'developmentBrandingEnabled','apnsEnabled']);diff --git a/frontend/src/routes/(auth)/login/[[mode]]/+page.svelte b/frontend/src/routes/(auth)/login/[[mode]]/+page.svelteindex abbf7c285..851a89b32 100644--- a/frontend/src/routes/(auth)/login/[[mode]]/+page.svelte+++ b/frontend/src/routes/(auth)/login/[[mode]]/+page.svelte@@ -23,7 +23,9 @@import { passkeyService } from '#lib/services/passkey-service.js';import userStore from '#lib/stores/user-store.svelte.js';import type { AuthenticationResponse, MFAChallenge as MFAChallengeData } from '#lib/types/auth.js';+ import { cn } from '#lib/utils.js';import { normalizeAuthenticationError } from '#lib/utils/auth.js';+ import { usesDevelopmentBranding } from '#lib/utils/branding.js';import { getApplicationLogo } from '#lib/utils/docker.js';import { getEffectiveLandingPage } from '#lib/utils/navigation.js';import { resolveLogoColor } from '#lib/utils/theme.svelte.js';@@ -42,9 +44,11 @@const logoColor = $derived(resolveLogoColor(mode.current === 'dark'));const animationsEnabled = $derived(userStore.current?.preferences?.animationsEnabled ?? true);+ const developmentBranding = $derived(usesDevelopmentBranding());const markUrl = $derived(getApplicationLogo(false, logoColor, logoColor, {- animated: animationsEnabled+ animated: animationsEnabled,+ development: developmentBranding}));@@ -183,12 +187,16 @@<div class="w-full max-w-sm md:max-w-3xl"><Card.Root><div- class="pointer-events-none absolute inset-x-6 top-0 z-1 h-px bg-linear-to-r from-transparent via-primary/60 to-transparent"+ class={cn('login-beam pointer-events-none absolute inset-0 z-1 rounded-xl', animationsEnabled && 'login-beam--animated')}></div><div class="grid md:grid-cols-2"><div class="p-6 md:p-8"><div class="mb-7 flex flex-col items-center text-center">- <img class="mb-4 size-10 drop-shadow-md drop-shadow-primary/15 md:hidden" src={markUrl} alt={m.layout_title()} />+ <img+ class={cn('mb-4 drop-shadow-md drop-shadow-primary/15 md:hidden', developmentBranding ? 'size-14' : 'size-10')}+ src={markUrl}+ alt={m.layout_title()}+ /><h1 class="text-2xl font-semibold tracking-tight">{m.welcome_back()}</h1>@@ -397,3 +405,44 @@</div></div></div>++<style>+ @property --login-beam-angle {+ syntax: '<angle>';+ initial-value: -45deg;+ inherits: false;+ }++ /* A 1px ring masked out of a rotating conic gradient, so the highlight travels around the card edge. */+ .login-beam {+ padding: 1px;+ background: conic-gradient(+ from var(--login-beam-angle),+ transparent 0deg,+ var(--primary) 50deg,+ transparent 100deg,+ transparent 180deg,+ color-mix(in oklab, var(--primary) 60%, transparent) 230deg,+ transparent 280deg+ );+ mask:+ linear-gradient(#000 0 0) content-box exclude,+ linear-gradient(#000 0 0);+ }++ .login-beam--animated {+ animation: login-beam-spin 6s linear infinite;+ }++ @keyframes login-beam-spin {+ to {+ --login-beam-angle: 315deg;+ }+ }++ @media (prefers-reduced-motion: reduce) {+ .login-beam--animated {+ animation: none;+ }+ }+</style>diff --git a/frontend/src/routes/(auth)/mobile/passkey/+page.svelte b/frontend/src/routes/(auth)/mobile/passkey/+page.svelteindex e7d6012c8..aa489ee01 100644--- a/frontend/src/routes/(auth)/mobile/passkey/+page.svelte+++ b/frontend/src/routes/(auth)/mobile/passkey/+page.svelte@@ -15,6 +15,7 @@import { AlertIcon, ApiKeyIcon, ShieldCheckIcon, SuccessIcon } from '#lib/icons/index.js';import { m } from '#lib/paraglide/messages.js';import { passkeyService } from '#lib/services/passkey-service.js';+ import { usesDevelopmentBranding } from '#lib/utils/branding.js';import { getApplicationLogo } from '#lib/utils/docker.js';import { tryCatch } from '#lib/utils/try-catch.js';@@ -32,7 +33,8 @@type CeremonyStatus = 'preparing' | 'ready' | 'working' | 'returning' | 'error';type PageError = 'invalid_request' | 'callback_failed';- const logoUrl = getApplicationLogo();+ const developmentBranding = $derived(usesDevelopmentBranding());+ const logoUrl = $derived(getApplicationLogo(false, undefined, undefined, { development: developmentBranding }));let status = $state<CeremonyStatus>('preparing');let pageError = $state<PageError>('invalid_request');let request = $state<MobilePasskeyBridgeRequest | null>(null);@@ -139,7 +141,7 @@<div class="mb-7 flex items-center justify-between gap-4"><div class="flex items-center gap-3"><div class="flex size-11 items-center justify-center rounded-xl border bg-background/50 ring-1 ring-border/40">- <img class="h-7 w-auto" src={logoUrl} alt={m.layout_title()} />+ <img class={developmentBranding ? 'size-9' : 'h-7 w-auto'} src={logoUrl} alt={m.layout_title()} /></div><p class="text-sm font-semibold tracking-wide">{m.layout_title()}</p></div>diff --git a/types/settings/settings.go b/types/settings/settings.goindex b14fe376e..43ae19c98 100644--- a/types/settings/settings.go+++ b/types/settings/settings.go@@ -271,6 +271,11 @@ type Update struct {ExperimentalFeaturesEnabled *string `json:"experimentalFeaturesEnabled,omitzero"`+ // DevelopmentBrandingEnabled shows the development icon on non-stable builds.+ //+ // Required: false+ DevelopmentBrandingEnabled *string `json:"developmentBrandingEnabled,omitzero"`+// DefaultShell is the default shell used for container execution.//// Required: false