Skip to content

Modern Docker Management, Designed for Everyone

refactor: remove onboarding screens with simple change password dialog (#759)

Kyle Mendell54512bfb2b5b
diff --git a/backend/internal/dto/user_dto.go b/backend/internal/dto/user_dto.go
index f9d57dc3b..54735cf57 100644
--- a/backend/internal/dto/user_dto.go
+++ b/backend/internal/dto/user_dto.go
@@ -18,13 +18,14 @@ type UpdateUserDto struct {
}
type UserResponseDto struct {
- ID string `json:"id"`
- Username string `json:"username"`
- DisplayName *string `json:"displayName,omitempty"`
- Email *string `json:"email,omitempty"`
- Roles []string `json:"roles"`
- OidcSubjectId *string `json:"oidcSubjectId,omitempty"`
- Locale *string `json:"locale,omitempty"`
- CreatedAt string `json:"createdAt,omitempty"`
- UpdatedAt string `json:"updatedAt,omitempty"`
+ ID string `json:"id"`
+ Username string `json:"username"`
+ DisplayName *string `json:"displayName,omitempty"`
+ Email *string `json:"email,omitempty"`
+ Roles []string `json:"roles"`
+ OidcSubjectId *string `json:"oidcSubjectId,omitempty"`
+ Locale *string `json:"locale,omitempty"`
+ CreatedAt string `json:"createdAt,omitempty"`
+ UpdatedAt string `json:"updatedAt,omitempty"`
+ RequiresPasswordChange bool `json:"requiresPasswordChange"`
}
diff --git a/backend/internal/models/auto_update.go b/backend/internal/models/auto_update.go
index fe7bb59a5..c77c3cbdb 100644
--- a/backend/internal/models/auto_update.go
+++ b/backend/internal/models/auto_update.go
@@ -16,14 +16,14 @@ const (
)
type AutoUpdateRecord struct {
- ResourceID string `json:"resourceId" gorm:"index;not null"`
- ResourceType string `json:"resourceType" gorm:"not null"`
- ResourceName string `json:"resourceName" gorm:"not null"`
- Status AutoUpdateStatus `json:"status" gorm:"not null"`
- StartTime time.Time `json:"startTime" gorm:"not null"`
+ ResourceID string `json:"resourceId"`
+ ResourceType string `json:"resourceType"`
+ ResourceName string `json:"resourceName"`
+ Status AutoUpdateStatus `json:"status"`
+ StartTime time.Time `json:"startTime"`
EndTime *time.Time `json:"endTime,omitempty"`
- UpdateAvailable bool `json:"updateAvailable" gorm:"default:false"`
- UpdateApplied bool `json:"updateApplied" gorm:"default:false"`
+ UpdateAvailable bool `json:"updateAvailable"`
+ UpdateApplied bool `json:"updateApplied"`
OldImageVersions JSON `json:"oldImageVersions,omitempty" gorm:"type:text"`
NewImageVersions JSON `json:"newImageVersions,omitempty" gorm:"type:text"`
Error *string `json:"error,omitempty"`
diff --git a/backend/internal/models/base.go b/backend/internal/models/base.go
index 98155cf85..9f39f69ee 100644
--- a/backend/internal/models/base.go
+++ b/backend/internal/models/base.go
@@ -10,8 +10,8 @@ import (
)
type BaseModel struct {
- ID string `json:"id" gorm:"primaryKey;type:text;not null"`
- CreatedAt time.Time `json:"createdAt" gorm:"not null" sortable:"true"`
+ ID string `json:"id" gorm:"primaryKey;type:text"`
+ CreatedAt time.Time `json:"createdAt" sortable:"true"`
UpdatedAt *time.Time `json:"updatedAt,omitempty"`
}
diff --git a/backend/internal/models/container_registry.go b/backend/internal/models/container_registry.go
index 81807107a..5f23c5845 100644
--- a/backend/internal/models/container_registry.go
+++ b/backend/internal/models/container_registry.go
@@ -5,12 +5,12 @@ import (
)
type ContainerRegistry struct {
- URL string `json:"url" gorm:"not null" sortable:"true"`
- Username string `json:"username" gorm:"not null" sortable:"true"`
- Token string `json:"token" gorm:"not null"`
+ URL string `json:"url" sortable:"true"`
+ Username string `json:"username" sortable:"true"`
+ Token string `json:"token"`
Description *string `json:"description,omitempty" sortable:"true"`
- Insecure bool `json:"insecure" gorm:"default:false" sortable:"true"`
- Enabled bool `json:"enabled" gorm:"default:true" sortable:"true"`
+ Insecure bool `json:"insecure" sortable:"true"`
+ Enabled bool `json:"enabled" sortable:"true"`
CreatedAt time.Time `json:"createdAt" sortable:"true"`
UpdatedAt time.Time `json:"updatedAt" sortable:"true"`
BaseModel
diff --git a/backend/internal/models/environment.go b/backend/internal/models/environment.go
index a1c4de0c4..9bae999c5 100644
--- a/backend/internal/models/environment.go
+++ b/backend/internal/models/environment.go
@@ -4,9 +4,9 @@ import "time"
type Environment struct {
Name string `json:"name" sortable:"true"`
- ApiUrl string `json:"apiUrl" gorm:"column:api_url;not null" sortable:"true"`
- Status string `json:"status" gorm:"default:offline" sortable:"true"`
- Enabled bool `json:"enabled" gorm:"default:true" sortable:"true"`
+ ApiUrl string `json:"apiUrl" gorm:"column:api_url" sortable:"true"`
+ Status string `json:"status" sortable:"true"`
+ Enabled bool `json:"enabled" sortable:"true"`
LastSeen *time.Time `json:"lastSeen" gorm:"column:last_seen"`
AccessToken *string `json:"-" gorm:"column:access_token"`
diff --git a/backend/internal/models/event.go b/backend/internal/models/event.go
index 3a65e9f56..2fb7bae3c 100644
--- a/backend/internal/models/event.go
+++ b/backend/internal/models/event.go
@@ -47,18 +47,18 @@ const (
)
type Event struct {
- Type EventType `json:"type" gorm:"not null" sortable:"true"`
- Severity EventSeverity `json:"severity" gorm:"not null" sortable:"true"`
- Title string `json:"title" gorm:"not null" sortable:"true"`
+ Type EventType `json:"type" sortable:"true"`
+ Severity EventSeverity `json:"severity" sortable:"true"`
+ Title string `json:"title" sortable:"true"`
Description string `json:"description"`
- ResourceType *string `json:"resourceType,omitempty" gorm:"index" sortable:"true"`
- ResourceID *string `json:"resourceId,omitempty" gorm:"index" sortable:"true"`
+ ResourceType *string `json:"resourceType,omitempty" sortable:"true"`
+ ResourceID *string `json:"resourceId,omitempty" sortable:"true"`
ResourceName *string `json:"resourceName,omitempty" sortable:"true"`
- UserID *string `json:"userId,omitempty" gorm:"index" sortable:"true"`
+ UserID *string `json:"userId,omitempty" sortable:"true"`
Username *string `json:"username,omitempty" sortable:"true"`
- EnvironmentID *string `json:"environmentId,omitempty" gorm:"index"`
+ EnvironmentID *string `json:"environmentId,omitempty"`
Metadata JSON `json:"metadata,omitempty" gorm:"type:text"`
- Timestamp time.Time `json:"timestamp" gorm:"not null;index" sortable:"true"`
+ Timestamp time.Time `json:"timestamp" sortable:"true"`
BaseModel
}
diff --git a/backend/internal/models/image_update.go b/backend/internal/models/image_update.go
index 27acb4169..0532d6bda 100644
--- a/backend/internal/models/image_update.go
+++ b/backend/internal/models/image_update.go
@@ -6,22 +6,22 @@ import (
type ImageUpdateRecord struct {
ID string `json:"id" gorm:"primaryKey;type:text"`
- Repository string `json:"repository" gorm:"not null;index"`
- Tag string `json:"tag" gorm:"not null;index"`
- HasUpdate bool `json:"hasUpdate" gorm:"column:has_update;default:false"`
+ Repository string `json:"repository"`
+ Tag string `json:"tag"`
+ HasUpdate bool `json:"hasUpdate" gorm:"column:has_update"`
UpdateType string `json:"updateType" gorm:"column:update_type"`
CurrentVersion string `json:"currentVersion" gorm:"column:current_version"`
LatestVersion *string `json:"latestVersion,omitempty" gorm:"column:latest_version"`
CurrentDigest *string `json:"currentDigest,omitempty" gorm:"column:current_digest"`
LatestDigest *string `json:"latestDigest,omitempty" gorm:"column:latest_digest"`
- CheckTime time.Time `json:"checkTime" gorm:"column:check_time;not null"`
+ CheckTime time.Time `json:"checkTime" gorm:"column:check_time"`
ResponseTimeMs int `json:"responseTimeMs" gorm:"column:response_time_ms"`
LastError *string `json:"lastError,omitempty" gorm:"column:last_error"`
AuthMethod *string `json:"authMethod,omitempty" gorm:"column:auth_method"`
AuthUsername *string `json:"authUsername,omitempty" gorm:"column:auth_username"`
AuthRegistry *string `json:"authRegistry,omitempty" gorm:"column:auth_registry"`
- UsedCredential bool `json:"usedCredential,omitempty" gorm:"column:used_credential;default:false"`
+ UsedCredential bool `json:"usedCredential,omitempty" gorm:"column:used_credential"`
BaseModel
}
diff --git a/backend/internal/models/project.go b/backend/internal/models/project.go
index 5af54111a..565cbd526 100644
--- a/backend/internal/models/project.go
+++ b/backend/internal/models/project.go
@@ -13,9 +13,9 @@ const (
)
type Project struct {
- Name string `json:"name" gorm:"not null" sortable:"true"`
- DirName *string `json:"dir_name" gorm:"unique"`
- Path string `json:"path" gorm:"not null"`
+ Name string `json:"name" sortable:"true"`
+ DirName *string `json:"dir_name"`
+ Path string `json:"path"`
Status ProjectStatus `json:"status" sortable:"true"`
StatusReason *string `json:"status_reason"`
ServiceCount int `json:"service_count" sortable:"true"`
diff --git a/backend/internal/models/settings.go b/backend/internal/models/settings.go
index 86236835f..dfee64bdc 100644
--- a/backend/internal/models/settings.go
+++ b/backend/internal/models/settings.go
@@ -17,7 +17,7 @@ const (
)
type SettingVariable struct {
- Key string `gorm:"primaryKey;not null"`
+ Key string `gorm:"primaryKey"`
Value string
}
@@ -44,14 +44,22 @@ func (s SettingVariable) AsDurationSeconds() time.Duration {
type Settings struct {
// General category
- ProjectsDirectory SettingVariable `key:"projectsDirectory" meta:"label=Projects Directory;type=text;keywords=projects,directory,path,folder,location,storage,files,compose,docker-compose;category=general;description=Configure where project files are stored" catmeta:"id=general;title=General;icon=settings;url=/settings/general;description=Core application settings and configuration"`
- DiskUsagePath SettingVariable `key:"diskUsagePath" meta:"label=Disk Usage Path;type=text;keywords=disk,usage,path,storage,folder,files;category=general;description=Path used for disk usage calculations"`
- BaseServerURL SettingVariable `key:"baseServerUrl" meta:"label=Base Server URL;type=text;keywords=base,url,server,domain,host,endpoint,address,link;category=general;description=Set the base URL for the application"`
- EnableGravatar SettingVariable `key:"enableGravatar" meta:"label=Enable Gravatar;type=boolean;keywords=gravatar,avatar,profile,picture,image,user,photo;category=general;description=Enable Gravatar profile pictures for users"`
- 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"`
- AccentColor SettingVariable `key:"accentColor,public" meta:"label=Accent Color;type=text;keywords=color,accent,theme,css,appearance,ui;category=general;description=Primary accent color for UI"`
+ ProjectsDirectory SettingVariable `key:"projectsDirectory" meta:"label=Projects Directory;type=text;keywords=projects,directory,path,folder,location,storage,files,compose,docker-compose;category=general;description=Configure where project files are stored" catmeta:"id=general;title=General;icon=settings;url=/settings/general;description=Core application settings and configuration"`
+ DiskUsagePath SettingVariable `key:"diskUsagePath" meta:"label=Disk Usage Path;type=text;keywords=disk,usage,path,storage,folder,files;category=general;description=Path used for disk usage calculations"`
+ BaseServerURL SettingVariable `key:"baseServerUrl" meta:"label=Base Server URL;type=text;keywords=base,url,server,domain,host,endpoint,address,link;category=general;description=Set the base URL for the application"`
+ EnableGravatar SettingVariable `key:"enableGravatar" meta:"label=Enable Gravatar;type=boolean;keywords=gravatar,avatar,profile,picture,image,user,photo;category=general;description=Enable Gravatar profile pictures for users"`
+ 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"`
+ AccentColor SettingVariable `key:"accentColor,public" meta:"label=Accent Color;type=text;keywords=color,accent,theme,css,appearance,ui;category=general;description=Primary accent color for UI"`
+
+ // Deprecated: OnboardingCompleted is no longer used as of the onboarding removal.
+ // This field is kept for backward compatibility and is automatically set to true on startup.
+ // This will be removed in a future release.
OnboardingCompleted SettingVariable `key:"onboardingCompleted,public" meta:"label=Onboarding Completed;type=boolean;keywords=onboarding,completed,setup,first-run;category=general;description=Whether onboarding has been completed"`
- OnboardingSteps SettingVariable `key:"onboardingSteps" meta:"label=Onboarding Steps;type=text;keywords=onboarding,steps,progress,guide;category=general;description=Serialized onboarding steps"`
+
+ // Deprecated: OnboardingSteps is no longer used as of the onboarding removal.
+ // This field is kept for backward compatibility only.
+ // This will be removed in a future release.
+ OnboardingSteps SettingVariable `key:"onboardingSteps" meta:"label=Onboarding Steps;type=text;keywords=onboarding,steps,progress,guide;category=general;description=Serialized onboarding steps"`
// Docker category
AutoUpdate SettingVariable `key:"autoUpdate" meta:"label=Auto Update;type=boolean;keywords=auto,update,automatic,upgrade,refresh,restart,deploy;category=docker;description=Automatically update containers when new images are available" catmeta:"id=docker;title=Docker;icon=database;url=/settings/docker;description=Configure Docker settings, polling, and auto-updates"`
diff --git a/backend/internal/models/template.go b/backend/internal/models/template.go
index eec0a8a88..3b9af524b 100644
--- a/backend/internal/models/template.go
+++ b/backend/internal/models/template.go
@@ -2,20 +2,20 @@ package models
type TemplateRegistry struct {
BaseModel
- Name string `json:"name" gorm:"not null"`
- URL string `json:"url" gorm:"not null;unique"`
- Enabled bool `json:"enabled" gorm:"default:true"`
+ Name string `json:"name"`
+ URL string `json:"url"`
+ Enabled bool `json:"enabled"`
Description string `json:"description"`
}
type ComposeTemplate struct {
BaseModel
- Name string `json:"name" gorm:"not null"`
+ Name string `json:"name"`
Description string `json:"description"`
Content string `json:"content" gorm:"type:text"`
EnvContent *string `json:"envContent,omitempty" gorm:"type:text"`
- IsCustom bool `json:"isCustom" gorm:"default:true"`
- IsRemote bool `json:"isRemote" gorm:"default:false"`
+ IsCustom bool `json:"isCustom"`
+ IsRemote bool `json:"isRemote"`
RegistryID *string `json:"registryId,omitempty"`
Registry *TemplateRegistry `json:"registry,omitempty" gorm:"foreignKey:RegistryID;references:ID"`
Metadata *ComposeTemplateMetadata `json:"metadata,omitempty" gorm:"embedded;embeddedPrefix:meta_"`
diff --git a/backend/internal/models/user.go b/backend/internal/models/user.go
index 2f7fb0400..a7558b696 100644
--- a/backend/internal/models/user.go
+++ b/backend/internal/models/user.go
@@ -5,19 +5,20 @@ import (
)
type User struct {
- Username string `json:"username" gorm:"uniqueIndex;not null" sortable:"true"`
- PasswordHash string `json:"-" gorm:"column:password_hash"`
- DisplayName *string `json:"displayName,omitempty" gorm:"column:display_name" sortable:"true"`
- Email *string `json:"email,omitempty" sortable:"true"`
- Roles StringSlice `json:"roles" gorm:"type:text;not null;default:'[]'"`
- OidcSubjectId *string `json:"oidcSubjectId,omitempty" gorm:"column:oidc_subject_id"`
- LastLogin *time.Time `json:"lastLogin,omitempty" gorm:"column:last_login" sortable:"true"`
- Locale *string `json:"locale,omitempty" gorm:"column:locale"`
+ Username string `json:"username" sortable:"true"`
+ PasswordHash string `json:"-" gorm:"column:password_hash"`
+ DisplayName *string `json:"displayName,omitempty" gorm:"column:display_name" sortable:"true"`
+ Email *string `json:"email,omitempty" sortable:"true"`
+ Roles StringSlice `json:"roles" gorm:"type:text"`
+ OidcSubjectId *string `json:"oidcSubjectId,omitempty" gorm:"column:oidc_subject_id"`
+ LastLogin *time.Time `json:"lastLogin,omitempty" gorm:"column:last_login" sortable:"true"`
+ Locale *string `json:"locale,omitempty" gorm:"column:locale"`
+ RequiresPasswordChange bool `json:"requiresPasswordChange" gorm:"column:requires_password_change"`
// OIDC provider tokens
OidcAccessToken *string `json:"-" gorm:"type:text"`
OidcRefreshToken *string `json:"-" gorm:"type:text"`
- OidcAccessTokenExpiresAt *time.Time `json:"-" gorm:"index"`
+ OidcAccessTokenExpiresAt *time.Time `json:"-"`
BaseModel
}
diff --git a/backend/internal/services/auth_service.go b/backend/internal/services/auth_service.go
index 1b6c61d64..da7e08235 100644
--- a/backend/internal/services/auth_service.go
+++ b/backend/internal/services/auth_service.go
@@ -524,6 +524,7 @@ func (s *AuthService) ChangePassword(ctx context.Context, userID, currentPasswor
}
user.PasswordHash = hashedPassword
+ user.RequiresPasswordChange = false
_, err = s.userService.UpdateUser(ctx, user)
return err
}
diff --git a/backend/internal/services/settings_service.go b/backend/internal/services/settings_service.go
index 9a0c021d1..8c83b45c0 100644
--- a/backend/internal/services/settings_service.go
+++ b/backend/internal/services/settings_service.go
@@ -109,21 +109,7 @@ func (s *SettingsService) loadDatabaseSettingsInternal(ctx context.Context, db *
if config.Load().UIConfigurationDisabled || config.Load().AgentMode {
slog.DebugContext(ctx, "loadDatabaseSettingsInternal: using env path", "UIConfigurationDisabled", config.Load().UIConfigurationDisabled, "AgentMode", config.Load().AgentMode, "Environment", config.Load().Environment)
-
- dst, err := s.loadDatabaseConfigFromEnv(ctx, db)
-
- if config.Load().Environment != "testing" {
- var onboardingVars []models.SettingVariable
- if err := db.WithContext(ctx).
- Where("key IN ?", []string{"onboardingCompleted", "onboardingSteps"}).
- Find(&onboardingVars).Error; err == nil {
- for _, v := range onboardingVars {
- _ = dst.UpdateField(v.Key, v.Value, false)
- }
- }
- }
-
- return dst, err
+ return s.loadDatabaseConfigFromEnv(ctx, db)
}
dest := s.getDefaultSettings()
diff --git a/backend/internal/services/user_service.go b/backend/internal/services/user_service.go
index 74dcb562c..5d855095b 100644
--- a/backend/internal/services/user_service.go
+++ b/backend/internal/services/user_service.go
@@ -216,15 +216,21 @@ func (s *UserService) CreateDefaultAdmin() error {
return nil
}
- _, err = s.CreateUserWithPassword("arcane", "arcane-admin", "admin@localhost", "admin", "Arcane Admin")
+ user, err := s.CreateUserWithPassword("arcane", "arcane-admin", "admin@localhost", "admin", "Arcane Admin")
if err != nil {
return fmt.Errorf("failed to create default admin user: %w", err)
}
+ // Mark this user as requiring password change on first login
+ user.RequiresPasswordChange = true
+ if err := s.db.Save(user).Error; err != nil {
+ slog.Warn("Failed to mark default admin for password change", "error", err)
+ }
+
slog.Info("👑 Default admin user created!")
slog.Info("🔑 Username: arcane")
slog.Info("🔑 Password: arcane-admin")
- slog.Info("⚠️ Please change this password after first login!")
+ slog.Info("⚠️ User will be prompted to change password on first login")
return nil
}
diff --git a/backend/internal/utils/bootstrap_util.go b/backend/internal/utils/bootstrap_util.go
index c06b2252e..9e57ca505 100644
--- a/backend/internal/utils/bootstrap_util.go
+++ b/backend/internal/utils/bootstrap_util.go
@@ -37,24 +37,25 @@ type SettingsManager interface {
func InitializeDefaultSettings(ctx context.Context, cfg *config.Config, settingsMgr SettingsManager) {
slog.InfoContext(ctx, "Ensuring default settings are initialized")
+ if err := settingsMgr.EnsureDefaultSettings(ctx); err != nil {
+ slog.WarnContext(ctx, "Failed to initialize default settings", slog.String("error", err.Error()))
+ } else {
+ slog.InfoContext(ctx, "Default settings initialized successfully")
+ }
+
+ // Mark onboarding as completed for all installs (onboarding is replaced with first-login password change)
+ if err := settingsMgr.SetBoolSetting(ctx, "onboardingCompleted", true); err != nil {
+ slog.WarnContext(ctx, "Failed to mark onboarding as completed", slog.String("error", err.Error()))
+ } else {
+ slog.InfoContext(ctx, "Onboarding marked as completed")
+ }
+
if cfg.AgentMode || cfg.UIConfigurationDisabled {
if err := settingsMgr.PersistEnvSettingsIfMissing(ctx); err != nil {
slog.WarnContext(ctx, "Failed to persist env-driven settings", slog.String("error", err.Error()))
} else {
slog.DebugContext(ctx, "Persisted env-driven settings if missing")
}
-
- if err := settingsMgr.SetBoolSetting(ctx, "onboardingCompleted", true); err != nil {
- slog.WarnContext(ctx, "Failed to mark onboarding as completed", slog.String("error", err.Error()))
- } else {
- slog.InfoContext(ctx, "Onboarding automatically completed (UI configuration disabled)")
- }
- }
-
- if err := settingsMgr.EnsureDefaultSettings(ctx); err != nil {
- slog.WarnContext(ctx, "Failed to initialize default settings", slog.String("error", err.Error()))
- } else {
- slog.InfoContext(ctx, "Default settings initialized successfully")
}
}
diff --git a/backend/resources/migrations/postgres/019_add_user_requires_password_change.down.sql b/backend/resources/migrations/postgres/019_add_user_requires_password_change.down.sql
new file mode 100644
index 000000000..19b394f77
--- /dev/null
+++ b/backend/resources/migrations/postgres/019_add_user_requires_password_change.down.sql
@@ -0,0 +1 @@
+ALTER TABLE users DROP COLUMN IF EXISTS requires_password_change;
diff --git a/backend/resources/migrations/postgres/019_add_user_requires_password_change.up.sql b/backend/resources/migrations/postgres/019_add_user_requires_password_change.up.sql
new file mode 100644
index 000000000..dc2b8efe3
--- /dev/null
+++ b/backend/resources/migrations/postgres/019_add_user_requires_password_change.up.sql
@@ -0,0 +1 @@
+ALTER TABLE users ADD COLUMN IF NOT EXISTS requires_password_change BOOLEAN NOT NULL DEFAULT FALSE;
diff --git a/backend/resources/migrations/sqlite/019_add_user_requires_password_change.down.sql b/backend/resources/migrations/sqlite/019_add_user_requires_password_change.down.sql
new file mode 100644
index 000000000..da4627ead
--- /dev/null
+++ b/backend/resources/migrations/sqlite/019_add_user_requires_password_change.down.sql
@@ -0,0 +1 @@
+ALTER TABLE users DROP COLUMN requires_password_change;
diff --git a/backend/resources/migrations/sqlite/019_add_user_requires_password_change.up.sql b/backend/resources/migrations/sqlite/019_add_user_requires_password_change.up.sql
new file mode 100644
index 000000000..b3e49b650
--- /dev/null
+++ b/backend/resources/migrations/sqlite/019_add_user_requires_password_change.up.sql
@@ -0,0 +1 @@
+ALTER TABLE users ADD COLUMN requires_password_change BOOLEAN NOT NULL DEFAULT 0;
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index 1f71fd9c9..2bd077e37 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -1367,5 +1367,19 @@
"glass_effect_enabled": "Glass effects enabled",
"glass_effect_disabled": "Glass effects disabled (classic design)",
"glass_effect_description_long": "When enabled, the interface uses frosted glass effects with backdrop blur and subtle gradients. When disabled, the interface uses solid colors and traditional shadows for a classic design. The glass design is in preview, and is subject to change.",
- "navigation_glass_effect_label": "Glass Effect"
+ "navigation_glass_effect_label": "Glass Effect",
+ "first_login_title": "Change Default Password",
+ "first_login_description": "For security reasons, you must change the default password before continuing.",
+ "first_login_current_password": "Current Password",
+ "first_login_current_password_placeholder": "Enter current password",
+ "first_login_new_password": "New Password",
+ "first_login_new_password_placeholder": "Enter new password (min 8 characters)",
+ "first_login_confirm_password": "Confirm New Password",
+ "first_login_confirm_password_placeholder": "Confirm new password",
+ "first_login_submit": "Change Password",
+ "first_login_submitting": "Changing…",
+ "first_login_error_mismatch": "Passwords do not match",
+ "first_login_error_length": "Password must be at least 8 characters",
+ "first_login_error_failed": "Failed to change password",
+ "first_login_success": "Password changed successfully"
}
diff --git a/frontend/src/lib/components/dialogs/first-login-password-dialog.svelte b/frontend/src/lib/components/dialogs/first-login-password-dialog.svelte
new file mode 100644
index 000000000..a02d23420
--- /dev/null
+++ b/frontend/src/lib/components/dialogs/first-login-password-dialog.svelte
@@ -0,0 +1,185 @@
+<script lang="ts">
+ import * as Dialog from '$lib/components/ui/dialog';
+ import * as Alert from '$lib/components/ui/alert';
+ import { Button } from '$lib/components/ui/button';
+ import { Input } from '$lib/components/ui/input';
+ import { Label } from '$lib/components/ui/label';
+ import { Spinner } from '$lib/components/ui/spinner/index.js';
+ import { authService } from '$lib/services/auth-service';
+ import { toast } from 'svelte-sonner';
+ import CircleAlert from '@lucide/svelte/icons/circle-alert';
+ import Eye from '@lucide/svelte/icons/eye';
+ import EyeOff from '@lucide/svelte/icons/eye-off';
+ import { m } from '$lib/paraglide/messages';
+
+ let {
+ open = $bindable(false),
+ onSuccess
+ }: {
+ open?: boolean;
+ onSuccess?: () => void;
+ } = $props();
+
+ let currentPassword = $state('arcane-admin');
+ let newPassword = $state('');
+ let confirmPassword = $state('');
+ let isLoading = $state(false);
+ let error = $state('');
+ let showCurrentPassword = $state(false);
+ let showNewPassword = $state(false);
+ let showConfirmPassword = $state(false);
+
+ const isValid = $derived(currentPassword.length > 0 && newPassword.length >= 8 && confirmPassword === newPassword);
+
+ async function handleSubmit() {
+ if (!isValid) {
+ if (newPassword.length < 8) {
+ error = m.first_login_error_length();
+ } else if (confirmPassword !== newPassword) {
+ error = m.first_login_error_mismatch();
+ }
+ return;
+ }
+
+ error = '';
+ isLoading = true;
+
+ try {
+ await authService.changePassword(currentPassword, newPassword);
+ toast.success(m.first_login_success());
+ open = false;
+ onSuccess?.();
+ } catch (err: any) {
+ error = err.message || m.first_login_error_failed();
+ } finally {
+ isLoading = false;
+ }
+ }
+</script>
+
+<Dialog.Root
+ bind:open
+ onOpenChange={(isOpen) => {
+ if (!isOpen) {
+ open = true;
+ }
+ }}
+>
+ <Dialog.Content class="sm:max-w-[425px] [&>button]:hidden">
+ <Dialog.Header>
+ <Dialog.Title>{m.first_login_title()}</Dialog.Title>
+ <Dialog.Description>{m.first_login_description()}</Dialog.Description>
+ </Dialog.Header>
+
+ <form
+ onsubmit={(e) => {
+ e.preventDefault();
+ handleSubmit();
+ }}
+ class="space-y-4"
+ >
+ {#if error}
+ <Alert.Root variant="destructive">
+ <CircleAlert class="h-4 w-4" />
+ <Alert.Title>Error</Alert.Title>
+ <Alert.Description>{error}</Alert.Description>
+ </Alert.Root>
+ {/if}
+
+ <div class="space-y-2">
+ <Label for="current-password">{m.first_login_current_password()}</Label>
+ <div class="relative">
+ <Input
+ id="current-password"
+ type={showCurrentPassword ? 'text' : 'password'}
+ bind:value={currentPassword}
+ placeholder={m.first_login_current_password_placeholder()}
+ required
+ disabled={isLoading}
+ />
+ <Button
+ type="button"
+ variant="ghost"
+ size="sm"
+ class="absolute top-0 right-0 h-full px-3 py-2 hover:bg-transparent"
+ onclick={() => (showCurrentPassword = !showCurrentPassword)}
+ disabled={isLoading}
+ >
+ {#if showCurrentPassword}
+ <EyeOff class="h-4 w-4" />
+ {:else}
+ <Eye class="h-4 w-4" />
+ {/if}
+ </Button>
+ </div>
+ </div>
+
+ <div class="space-y-2">
+ <Label for="new-password">{m.first_login_new_password()}</Label>
+ <div class="relative">
+ <Input
+ id="new-password"
+ type={showNewPassword ? 'text' : 'password'}
+ bind:value={newPassword}
+ placeholder={m.first_login_new_password_placeholder()}
+ required
+ disabled={isLoading}
+ />
+ <Button
+ type="button"
+ variant="ghost"
+ size="sm"
+ class="absolute top-0 right-0 h-full px-3 py-2 hover:bg-transparent"
+ onclick={() => (showNewPassword = !showNewPassword)}
+ disabled={isLoading}
+ >
+ {#if showNewPassword}
+ <EyeOff class="h-4 w-4" />
+ {:else}
+ <Eye class="h-4 w-4" />
+ {/if}
+ </Button>
+ </div>
+ </div>
+
+ <div class="space-y-2">
+ <Label for="confirm-password">{m.first_login_confirm_password()}</Label>
+ <div class="relative">
+ <Input
+ id="confirm-password"
+ type={showConfirmPassword ? 'text' : 'password'}
+ bind:value={confirmPassword}
+ placeholder={m.first_login_confirm_password_placeholder()}
+ required
+ disabled={isLoading}
+ />
+ <Button
+ type="button"
+ variant="ghost"
+ size="sm"
+ class="absolute top-0 right-0 h-full px-3 py-2 hover:bg-transparent"
+ onclick={() => (showConfirmPassword = !showConfirmPassword)}
+ disabled={isLoading}
+ >
+ {#if showConfirmPassword}
+ <EyeOff class="h-4 w-4" />
+ {:else}
+ <Eye class="h-4 w-4" />
+ {/if}
+ </Button>
+ </div>
+ </div>
+
+ <Dialog.Footer>
+ <Button type="submit" disabled={!isValid || isLoading}>
+ {#if isLoading}
+ <Spinner class="mr-2 h-4 w-4" />
+ {m.first_login_submitting()}
+ {:else}
+ {m.first_login_submit()}
+ {/if}
+ </Button>
+ </Dialog.Footer>
+ </form>
+ </Dialog.Content>
+</Dialog.Root>
diff --git a/frontend/src/lib/services/auth-service.ts b/frontend/src/lib/services/auth-service.ts
index 0c7a69e4b..3c6175fd6 100644
--- a/frontend/src/lib/services/auth-service.ts
+++ b/frontend/src/lib/services/auth-service.ts
@@ -1,5 +1,4 @@
-import { goto } from '$app/navigation';
-import { invalidateAll } from '$app/navigation';
+import { goto, invalidateAll } from '$app/navigation';
import BaseAPIService from './api-service';
import userStore from '$lib/stores/user-store';
import type { User } from '$lib/types/user.type';
@@ -54,6 +53,15 @@ export class AuthService extends BaseAPIService {
async getStatus(): Promise<OidcStatusInfo> {
return this.handleResponse(this.api.get('/oidc/status'));
}
+
+ async changePassword(currentPassword: string, newPassword: string): Promise<void> {
+ await this.handleResponse(
+ this.api.post('/auth/password', {
+ currentPassword,
+ newPassword
+ })
+ );
+ }
}
export const authService = new AuthService();
diff --git a/frontend/src/lib/types/user.type.ts b/frontend/src/lib/types/user.type.ts
index dbc56e09f..dc492b928 100644
--- a/frontend/src/lib/types/user.type.ts
+++ b/frontend/src/lib/types/user.type.ts
@@ -12,11 +12,12 @@ export type User = {
updatedAt?: string;
oidcSubjectId?: string;
locale?: Locale;
+ requiresPasswordChange?: boolean;
};
export type CreateUser = Omit<
User,
- 'id' | 'createdAt' | 'updatedAt' | 'lastLogin' | 'oidcSubjectId' | 'passwordHash' | 'requirePasswordChange' | 'roles'
+ 'id' | 'createdAt' | 'updatedAt' | 'lastLogin' | 'oidcSubjectId' | 'passwordHash' | 'requiresPasswordChange' | 'roles'
> & {
password: string;
roles?: string[];
diff --git a/frontend/src/lib/utils/redirect.util.ts b/frontend/src/lib/utils/redirect.util.ts
index e7fb92084..a88424fb8 100644
--- a/frontend/src/lib/utils/redirect.util.ts
+++ b/frontend/src/lib/utils/redirect.util.ts
@@ -1,5 +1,4 @@
import type { User } from '$lib/types/user.type';
-import type { Settings } from '$lib/types/settings.type';
const PROTECTED_PREFIXES = [
'dashboard',
@@ -22,7 +21,7 @@ const isProtectedPath = (path: string) => {
return result;
};
-export function getAuthRedirectPath(path: string, user: User | null, settings: Settings | null) {
+export function getAuthRedirectPath(path: string, user: User | null) {
const isSignedIn = !!user;
const isUnauthenticatedOnlyPath =
@@ -36,19 +35,11 @@ export function getAuthRedirectPath(path: string, user: User | null, settings: S
path.startsWith('/img') ||
path === '/favicon.ico';
- const isOnboardingPath = path === '/onboarding' || path.startsWith('/onboarding');
-
if (!isSignedIn && isProtectedPath(path)) {
return '/auth/login';
}
- if (isSignedIn && settings && !settings.onboardingCompleted) {
- if (!isOnboardingPath) {
- return '/onboarding/welcome';
- }
- }
-
- if (isUnauthenticatedOnlyPath && isSignedIn && settings?.onboardingCompleted) {
+ if (isUnauthenticatedOnlyPath && isSignedIn) {
return '/dashboard';
}
diff --git a/frontend/src/routes/+layout.svelte b/frontend/src/routes/+layout.svelte
index 02cfe0ab4..bb2421990 100644
--- a/frontend/src/routes/+layout.svelte
+++ b/frontend/src/routes/+layout.svelte
@@ -20,6 +20,8 @@
import { browser, dev } from '$app/environment';
import { onMount } from 'svelte';
import settingsStore from '$lib/stores/config-store';
+ import FirstLoginPasswordDialog from '$lib/components/dialogs/first-login-password-dialog.svelte';
+ import { invalidateAll } from '$app/navigation';
let {
data,
@@ -52,14 +54,6 @@
const isMobile = new IsMobile();
const isTablet = new IsTablet();
const isNavigating = $derived(navigating.type !== null);
- const isOnboardingPage = $derived(String(page.url.pathname).startsWith('/onboarding'));
-
- const navigationSettings = $derived.by(() => {
- settings;
- navigationSettingsOverridesStore.current;
- return getEffectiveNavigationSettings();
- });
- const navigationMode = $derived(navigationSettings.mode);
const isLoginPage = $derived(
String(page.url.pathname) === '/login' ||
String(page.url.pathname).startsWith('/auth/login') ||
@@ -67,8 +61,30 @@
String(page.url.pathname).includes('/login') ||
String(page.url.pathname).includes('/callback')
);
+ let showPasswordChangeDialog = $state(false);
+
+ $effect(() => {
+ // Show password change dialog if user requires password change
+ // Make it reactive to data changes
+ if (data.user && data.user.requiresPasswordChange && !isLoginPage) {
+ showPasswordChangeDialog = true;
+ } else {
+ showPasswordChangeDialog = false;
+ }
+ });
+
+ function handlePasswordChangeSuccess() {
+ invalidateAll();
+ }
+
+ const navigationSettings = $derived.by(() => {
+ settings;
+ navigationSettingsOverridesStore.current;
+ return getEffectiveNavigationSettings();
+ });
+ const navigationMode = $derived(navigationSettings.mode);
- const redirectPath = getAuthRedirectPath(page.url.pathname, user, settings);
+ const redirectPath = getAuthRedirectPath(page.url.pathname, user);
if (redirectPath) {
goto(redirectPath);
}
@@ -91,7 +107,7 @@
<div class="bg-background flex min-h-screen flex-col">
{#if !settings}
<Error message={m.error_occurred()} showButton={true} />
- {:else if !isOnboardingPage && !isLoginPage}
+ {:else if !isLoginPage}
{#if isMobile.current}
<main class="flex-1">
<section
@@ -143,3 +159,4 @@
/>
<ConfirmDialog />
<LoadingIndicator active={isNavigating} thickness="h-1.5" />
+<FirstLoginPasswordDialog bind:open={showPasswordChangeDialog} onSuccess={handlePasswordChangeSuccess} />
diff --git a/frontend/src/routes/auth/login/+page.svelte b/frontend/src/routes/auth/login/+page.svelte
index 8a590cc84..00db2f481 100644
--- a/frontend/src/routes/auth/login/+page.svelte
+++ b/frontend/src/routes/auth/login/+page.svelte
@@ -52,11 +52,8 @@
try {
const user = await authService.login({ username, password });
userStore.setUser(user);
- // Load settings to determine onboarding redirect
- const settings = await settingsService.getSettings();
- settingsStore.set(settings);
const redirectTo = data.redirectTo || '/dashboard';
- goto(!settings.onboardingCompleted ? '/onboarding/welcome' : redirectTo, { replaceState: true });
+ goto(redirectTo, { replaceState: true });
} catch (err) {
error = err instanceof Error ? err.message : 'Login failed';
} finally {
diff --git a/frontend/src/routes/auth/oidc/callback/+page.svelte b/frontend/src/routes/auth/oidc/callback/+page.svelte
index c74fbcaf2..0b51cea55 100644
--- a/frontend/src/routes/auth/oidc/callback/+page.svelte
+++ b/frontend/src/routes/auth/oidc/callback/+page.svelte
@@ -82,7 +82,7 @@
const settings = await settingsService.getSettings();
settingsStore.set(settings);
toast.success('Successfully logged in!');
- goto(!settings.onboardingCompleted ? '/onboarding/welcome' : redirectTo, { replaceState: true });
+ goto(redirectTo, { replaceState: true });
}
await invalidateAll();
diff --git a/frontend/src/routes/onboarding/+layout.svelte b/frontend/src/routes/onboarding/+layout.svelte
deleted file mode 100644
index 6ee34812f..000000000
--- a/frontend/src/routes/onboarding/+layout.svelte
+++ /dev/null
@@ -1,60 +0,0 @@
-<script lang="ts">
- import '../../app.css';
- import KeyIcon from '@lucide/svelte/icons/key';
- import SettingsIcon from '@lucide/svelte/icons/settings';
- import DatabaseIcon from '@lucide/svelte/icons/database';
- import ShieldIcon from '@lucide/svelte/icons/shield';
- import CircleCheckIcon from '@lucide/svelte/icons/check-circle';
- import { page } from '$app/state';
- import { getApplicationLogo } from '$lib/utils/image.util';
-
- let { children } = $props();
-
- // Make logo URL reactive to accent color changes
- let logoUrl = $derived(getApplicationLogo());
-
- const steps = [
- { id: 'welcome', label: 'Welcome', path: '/onboarding/welcome', icon: CircleCheckIcon },
- { id: 'password', label: 'Admin Password', path: '/onboarding/password', icon: KeyIcon },
- { id: 'docker', label: 'Docker Setup', path: '/onboarding/docker', icon: DatabaseIcon },
- { id: 'security', label: 'Security', path: '/onboarding/security', icon: ShieldIcon },
- { id: 'settings', label: 'Application Settings', path: '/onboarding/settings', icon: SettingsIcon },
- { id: 'complete', label: 'Complete', path: '/onboarding/complete', icon: CircleCheckIcon }
- ];
-
- const currentStepIndex = $derived(steps.findIndex((step) => page.url.pathname === step.path));
-</script>
-
-<div class="flex min-h-screen flex-col blob-floating" style="--blob-speed: 22s">
- <header class="border-b px-8 py-8 glass glass-subtle">
- <div class="flex items-center">
- <img src={logoUrl} alt="Arcane" class="size-12" />
- <h1 class="ml-4 text-2xl font-bold">Arcane Setup</h1>
- </div>
- </header>
-
- <div class="container mx-auto px-4 py-6">
- <div class="mb-8 flex items-center justify-between">
- {#each steps as step, i (step.id)}
- <div class="flex flex-col items-center">
- <div
- class={`flex size-10 items-center justify-center rounded-full ${i <= currentStepIndex ? 'bg-primary text-primary-foreground' : 'bg-muted text-muted-foreground'}`}
- >
- <step.icon class="size-5" />
- </div>
- <span class={`mt-2 text-sm ${i <= currentStepIndex ? 'text-foreground' : 'text-muted-foreground'}`}>{step.label}</span>
- </div>
-
- {#if i < steps.length - 1}
- <div class={`h-1 flex-1 ${i < currentStepIndex ? 'bg-primary' : 'bg-muted'}`}></div>
- {/if}
- {/each}
- </div>
- </div>
-
- <main class="container mx-auto flex-1 px-4 py-6">
- <div class="glass bubble bubble-shadow rounded-2xl border p-8">
- {@render children()}
- </div>
- </main>
-</div>
diff --git a/frontend/src/routes/onboarding/complete/+page.svelte b/frontend/src/routes/onboarding/complete/+page.svelte
deleted file mode 100644
index dc0d9298c..000000000
--- a/frontend/src/routes/onboarding/complete/+page.svelte
+++ /dev/null
@@ -1,75 +0,0 @@
-<script lang="ts">
- import { Button } from '$lib/components/ui/button';
- import { toast } from 'svelte-sonner';
- import { goto, invalidateAll } from '$app/navigation';
- import { Spinner } from '$lib/components/ui/spinner/index.js';
- import CircleCheckIcon from '@lucide/svelte/icons/check-circle';
- import ArrowRightIcon from '@lucide/svelte/icons/arrow-right';
- import { settingsService } from '$lib/services/settings-service.js';
-
- let { data } = $props();
- let currentSettings = $state(data.settings);
-
- let isLoading = $state(false);
-
- async function completeOnboarding() {
- isLoading = true;
-
- try {
- await settingsService.updateSettings({
- ...currentSettings,
- onboardingCompleted: true,
- onboardingSteps: {
- welcome: true,
- password: true,
- docker: true,
- security: true,
- settings: true
- }
- });
-
- toast.success('Onboarding completed successfully!');
- await invalidateAll();
- goto('/', { replaceState: true });
- } catch (error) {
- toast.error('Failed to complete onboarding');
- } finally {
- isLoading = false;
- }
- }
-</script>
-
-<div class="space-y-6 text-center">
- <div class="mx-auto flex size-20 items-center justify-center rounded-full bg-green-100">
- <CircleCheckIcon class="size-10 text-green-600" />
- </div>
-
- <div>
- <h2 class="text-2xl font-bold">Setup Complete!</h2>
- <p class="text-muted-foreground mt-2">
- Congratulations! You've successfully configured Arcane. You're ready to start managing your containers.
- </p>
- </div>
-
- <div class="space-y-4">
- <div class="bg-muted/50 rounded-lg border p-4">
- <h3 class="font-semibold">What's Next?</h3>
- <ul class="text-muted-foreground mt-2 space-y-1 text-sm">
- <li>• Start managing your Docker containers and images</li>
- <li>• Create and deploy Docker Compose Projects</li>
- <li>• Monitor system resources and performance</li>
- <li>• Configure additional settings as needed</li>
- </ul>
- </div>
-
- <Button onclick={completeOnboarding} disabled={isLoading} size="lg" class="w-full">
- {#if isLoading}
- <Spinner class="mr-2 size-4" />
- Completing Setup...
- {:else}
- Go to Dashboard
- <ArrowRightIcon class="ml-2 size-4" />
- {/if}
- </Button>
- </div>
-</div>
diff --git a/frontend/src/routes/onboarding/complete/+page.ts b/frontend/src/routes/onboarding/complete/+page.ts
deleted file mode 100644
index c7c50c49f..000000000
--- a/frontend/src/routes/onboarding/complete/+page.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { redirect } from '@sveltejs/kit';
-import type { PageLoad } from './$types';
-import { settingsService } from '$lib/services/settings-service';
-
-export const load: PageLoad = async () => {
- const settings = await settingsService.getSettings();
-
- if (settings.onboardingCompleted) {
- throw redirect(302, '/dashboard');
- }
-
- return { settings };
-};
diff --git a/frontend/src/routes/onboarding/docker/+page.svelte b/frontend/src/routes/onboarding/docker/+page.svelte
deleted file mode 100644
index 80b5f43e4..000000000
--- a/frontend/src/routes/onboarding/docker/+page.svelte
+++ /dev/null
@@ -1,223 +0,0 @@
-<script lang="ts">
- import { Button } from '$lib/components/ui/button';
- import * as Card from '$lib/components/ui/card';
- import * as Alert from '$lib/components/ui/alert';
- import { toast } from 'svelte-sonner';
- import { goto } from '$app/navigation';
- import { Spinner } from '$lib/components/ui/spinner';
- import ZapIcon from '@lucide/svelte/icons/zap';
- import SwitchWithLabel from '$lib/components/form/labeled-switch.svelte';
- import FormInput from '$lib/components/form/form-input.svelte';
- import SelectWithLabel from '$lib/components/form/select-with-label.svelte';
- import { createForm } from '$lib/utils/form.utils';
- import { z } from 'zod/v4';
- import { m } from '$lib/paraglide/messages';
- import settingsStore from '$lib/stores/config-store';
- import type { Settings } from '$lib/types/settings.type';
- import { settingsService } from '$lib/services/settings-service.js';
-
- let { data } = $props();
- let currentSettings = $state<Settings>(data.settings);
-
- let isLoading = $state(false);
- let pruneMode = $derived(currentSettings.dockerPruneMode);
-
- type PollingIntervalMode = 'hourly' | 'daily' | 'weekly' | 'custom';
-
- const imagePollingOptions: Array<{
- value: PollingIntervalMode;
- label: string;
- description: string;
- minutes?: number;
- }> = [
- { value: 'hourly', minutes: 60, label: m.hourly(), description: m.polling_hourly_description() },
- { value: 'daily', minutes: 1440, label: m.daily(), description: m.polling_daily_description() },
- { value: 'weekly', minutes: 10080, label: m.weekly(), description: m.polling_weekly_description() },
- { value: 'custom', label: m.custom(), description: m.use_custom_polling_value() }
- ];
-
- const presetToMinutes = Object.fromEntries(
- imagePollingOptions.filter((o) => o.value !== 'custom').map((o) => [o.value, o.minutes!])
- ) as Record<Exclude<PollingIntervalMode, 'custom'>, number>;
-
- let pollingIntervalMode = $state<PollingIntervalMode>(
- imagePollingOptions.find((o) => o.minutes === currentSettings.pollingInterval)?.value ?? 'custom'
- );
-
- const pruneModeOptions = [
- { value: 'all', label: m.docker_prune_all(), description: m.docker_prune_all_description() },
- { value: 'dangling', label: m.docker_prune_dangling(), description: m.docker_prune_dangling_description() }
- ];
-
- const pruneModeDescription = $derived(
- pruneModeOptions.find((o) => o.value === pruneMode)?.description ?? m.docker_prune_mode_description()
- );
-
- const formSchema = z.object({
- pollingEnabled: z.boolean(),
- pollingInterval: z.number().int().min(5).max(10080),
- autoUpdate: z.boolean(),
- autoUpdateInterval: z.number().int(),
- dockerPruneMode: z.enum(['all', 'dangling'])
- });
-
- let { inputs: formInputs, ...form } = $derived(createForm<typeof formSchema>(formSchema, currentSettings));
-
- $effect(() => {
- if (pollingIntervalMode !== 'custom') {
- $formInputs.pollingInterval.value = presetToMinutes[pollingIntervalMode];
- }
- });
-
- async function handleNext() {
- const data = form.validate();
- if (!data) return;
- isLoading = true;
-
- try {
- const updated = {
- ...currentSettings,
- ...data,
- onboardingCompleted: false,
- onboardingSteps: { ...currentSettings.onboardingSteps, docker: true }
- } as Partial<Settings>;
-
- await settingsService.updateSettings(updated as any);
- currentSettings = { ...(currentSettings as Settings), ...(updated as Settings) };
- settingsStore.set(currentSettings);
- settingsStore.reload();
-
- goto('/onboarding/security');
- } catch (error) {
- toast.error('Failed to save Docker settings');
- } finally {
- isLoading = false;
- }
- }
-
- function handleSkip() {
- goto('/onboarding/security');
- }
-</script>
-
-<div class="space-y-6">
- <div class="text-center">
- <h2 class="text-2xl font-bold">Docker Configuration</h2>
- <p class="text-muted-foreground mt-2">Configure how Arcane checks Docker and auto-updates</p>
- </div>
-
- {#if $formInputs.autoUpdate.value && $formInputs.pollingEnabled.value}
- <Alert.Root variant="warning">
- <ZapIcon class="size-4" />
- <Alert.Title>{m.docker_auto_update_alert_title()}</Alert.Title>
- <Alert.Description>{m.docker_auto_update_alert_description()}</Alert.Description>
- </Alert.Root>
- {/if}
-
- <div class="grid gap-6 md:grid-cols-2">
- <Card.Root class="flex flex-col gap-6 py-3">
- <Card.Header
- class="@container/card-header grid auto-rows-min grid-rows-[auto_auto] items-start gap-1.5 px-6 has-data-[slot=card-action]:grid-cols-[1fr_auto] [.border-b]:pb-6"
- >
- <Card.Title>{m.docker_title()}</Card.Title>
- <Card.Description>{m.docker_description()}</Card.Description>
- </Card.Header>
- <Card.Content class="space-y-6 px-6">
- <SwitchWithLabel
- id="pollingEnabled"
- label={m.docker_enable_polling_label()}
- description={m.docker_enable_polling_description()}
- error={$formInputs.pollingEnabled.error}
- bind:checked={$formInputs.pollingEnabled.value}
- />
-
- {#if $formInputs.pollingEnabled.value}
- <div class="space-y-4">
- <!-- New: preset select + optional custom input -->
- <SelectWithLabel
- id="pollingIntervalMode"
- name="pollingIntervalMode"
- bind:value={pollingIntervalMode}
- label={m.docker_polling_interval_label()}
- options={imagePollingOptions.map(({ value, label, description }) => ({ value, label, description }))}
- />
-
- {#if pollingIntervalMode === 'custom'}
- <FormInput
- bind:input={$formInputs.pollingInterval}
- type="number"
- id="pollingInterval"
- label={m.custom_polling_interval()}
- placeholder={m.docker_polling_interval_placeholder()}
- description={m.docker_polling_interval_description()}
- />
- {/if}
-
- {#if $formInputs.pollingInterval.value < 30}
- <Alert.Root variant="warning">
- <ZapIcon class="size-4" />
- <Alert.Title>{m.docker_rate_limit_warning_title()}</Alert.Title>
- <Alert.Description>{m.docker_rate_limit_warning_description()}</Alert.Description>
- </Alert.Root>
- {/if}
-
- <SwitchWithLabel
- id="autoUpdateSwitch"
- label={m.docker_auto_update_label()}
- description={m.docker_auto_update_description()}
- error={$formInputs.autoUpdate.error}
- bind:checked={$formInputs.autoUpdate.value}
- />
-
- {#if $formInputs.autoUpdate.value}
- <FormInput
- bind:input={$formInputs.autoUpdateInterval}
- type="number"
- id="autoUpdateInterval"
- label={m.docker_auto_update_interval_label()}
- placeholder={m.docker_auto_update_interval_placeholder()}
- description={m.docker_auto_update_interval_description()}
- />
- {/if}
- </div>
- {/if}
- </Card.Content>
- </Card.Root>
-
- <Card.Root class="flex flex-col gap-6 py-3">
- <Card.Header
- class="@container/card-header grid auto-rows-min grid-rows-[auto_auto] items-start gap-1.5 px-6 has-data-[slot=card-action]:grid-cols-[1fr_auto] [.border-b]:pb-6"
- >
- <Card.Title>{m.docker_prune_action_label()}</Card.Title>
- <Card.Description>{pruneModeDescription}</Card.Description>
- </Card.Header>
- <Card.Content class="px-6">
- <SelectWithLabel
- id="dockerPruneMode"
- name="pruneMode"
- bind:value={$formInputs.dockerPruneMode.value}
- error={$formInputs.dockerPruneMode.error}
- label={m.docker_prune_action_label()}
- description={pruneModeDescription}
- placeholder={m.docker_prune_placeholder()}
- options={pruneModeOptions}
- groupLabel={m.docker_prune_group_label()}
- onValueChange={(v) => (pruneMode = v as 'all' | 'dangling')}
- />
- </Card.Content>
- </Card.Root>
- </div>
-
- <div class="flex justify-between">
- <Button variant="outline" onclick={() => goto('/onboarding/password')}>Back</Button>
- <div class="flex gap-2">
- <Button variant="ghost" onclick={handleSkip}>Skip</Button>
- <Button onclick={handleNext} disabled={isLoading}>
- {#if isLoading}
- <Spinner class="mr-2 size-4" />
- {/if}
- Next
- </Button>
- </div>
- </div>
-</div>
diff --git a/frontend/src/routes/onboarding/docker/+page.ts b/frontend/src/routes/onboarding/docker/+page.ts
deleted file mode 100644
index c7c50c49f..000000000
--- a/frontend/src/routes/onboarding/docker/+page.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { redirect } from '@sveltejs/kit';
-import type { PageLoad } from './$types';
-import { settingsService } from '$lib/services/settings-service';
-
-export const load: PageLoad = async () => {
- const settings = await settingsService.getSettings();
-
- if (settings.onboardingCompleted) {
- throw redirect(302, '/dashboard');
- }
-
- return { settings };
-};
diff --git a/frontend/src/routes/onboarding/password/+page.svelte b/frontend/src/routes/onboarding/password/+page.svelte
deleted file mode 100644
index ef7d2c319..000000000
--- a/frontend/src/routes/onboarding/password/+page.svelte
+++ /dev/null
@@ -1,122 +0,0 @@
-<script lang="ts">
- import { Button } from '$lib/components/ui/button/index.js';
- import { Input } from '$lib/components/ui/input/index.js';
- import { Label } from '$lib/components/ui/label/index.js';
- import * as Alert from '$lib/components/ui/alert/index.js';
- import CircleAlertIcon from '@lucide/svelte/icons/alert-circle';
- import ChevronRightIcon from '@lucide/svelte/icons/chevron-right';
- import { preventDefault } from '$lib/utils/form.utils';
- import { goto } from '$app/navigation';
- import settingsStore from '$lib/stores/config-store';
- import { settingsService } from '$lib/services/settings-service.js';
- import { userService } from '$lib/services/user-service.js';
-
- let { data } = $props();
- let currentSettings = $state(data.settings);
-
- async function continueToNextStep() {
- const updatedSettings = await settingsService.updateSettings({
- ...currentSettings,
- onboardingCompleted: false,
- onboardingSteps: {
- ...currentSettings.onboardingSteps,
- password: true
- }
- });
-
- currentSettings = updatedSettings;
- settingsStore.set(updatedSettings);
-
- goto('/onboarding/docker');
- }
-
- let password = $state('');
- let confirmPassword = $state('');
- let error = $state('');
- let loading = $state(false);
-
- async function handleSubmit() {
- loading = true;
- error = '';
-
- if (!password || password.length < 8) {
- error = 'Password must be at least 8 characters long';
- loading = false;
- return;
- }
-
- if (password !== confirmPassword) {
- error = 'Passwords do not match';
- loading = false;
- return;
- }
-
- try {
- await userService.changePassword({
- currentPassword: 'arcane-admin',
- newPassword: password
- });
-
- await continueToNextStep();
- } catch (err) {
- console.error('Error in handleSubmit:', err);
- error = err instanceof Error ? err.message : 'An unexpected error occurred';
- } finally {
- loading = false;
- }
- }
-</script>
-
-<div class="mx-auto max-w-lg">
- <h1 class="mb-8 text-center text-3xl font-bold">Change Admin Password</h1>
-
- <div class="mb-8 space-y-2">
- <p class="text-md text-center">For security reasons, please change the default admin password.</p>
- </div>
-
- {#if error}
- <Alert.Root class="mb-8" variant="destructive">
- <CircleAlertIcon class="mr-2 size-5" />
- <Alert.Title>Error</Alert.Title>
- <Alert.Description>{error}</Alert.Description>
- </Alert.Root>
- {/if}
-
- <form class="space-y-8" onsubmit={preventDefault(handleSubmit)}>
- <div class="space-y-6">
- <div class="space-y-4">
- <Label for="password" class="mb-2 block text-base">New Password</Label>
- <Input
- id="password"
- type="password"
- bind:value={password}
- placeholder="Enter new password"
- class="bg-muted/10 h-12 px-4"
- required
- />
- </div>
-
- <div class="space-y-4">
- <Label for="confirmPassword" class="mb-2 block text-base">Confirm Password</Label>
- <Input
- id="confirmPassword"
- type="password"
- bind:value={confirmPassword}
- placeholder="Confirm new password"
- class="bg-muted/10 h-12 px-4"
- required
- />
- </div>
- </div>
-
- <div class="flex justify-center pt-8">
- <Button type="submit" disabled={loading} class="flex h-12 w-[80%] items-center px-8">
- {#if loading}
- <span class="inline-block size-4 animate-spin rounded-full border-2 border-white border-t-transparent"></span>
- {/if}
- Continue
- <ChevronRightIcon class="size-4" />
- </Button>
- </div>
- </form>
-</div>
diff --git a/frontend/src/routes/onboarding/password/+page.ts b/frontend/src/routes/onboarding/password/+page.ts
deleted file mode 100644
index c7c50c49f..000000000
--- a/frontend/src/routes/onboarding/password/+page.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { redirect } from '@sveltejs/kit';
-import type { PageLoad } from './$types';
-import { settingsService } from '$lib/services/settings-service';
-
-export const load: PageLoad = async () => {
- const settings = await settingsService.getSettings();
-
- if (settings.onboardingCompleted) {
- throw redirect(302, '/dashboard');
- }
-
- return { settings };
-};
diff --git a/frontend/src/routes/onboarding/security/+page.svelte b/frontend/src/routes/onboarding/security/+page.svelte
deleted file mode 100644
index da1f11dbb..000000000
--- a/frontend/src/routes/onboarding/security/+page.svelte
+++ /dev/null
@@ -1,310 +0,0 @@
-<script lang="ts">
- import type { PageData } from './$types';
- import { Button } from '$lib/components/ui/button';
- import * as FieldSet from '$lib/components/ui/field-set';
- import FormInput from '$lib/components/form/form-input.svelte';
- import SwitchWithLabel from '$lib/components/form/labeled-switch.svelte';
- import * as Tooltip from '$lib/components/ui/tooltip';
- import OidcConfigDialog from '$lib/components/dialogs/oidc-config-dialog.svelte';
- import { Spinner } from '$lib/components/ui/spinner/index.js';
- import { toast } from 'svelte-sonner';
- import { goto } from '$app/navigation';
- import { createForm, preventDefault } from '$lib/utils/form.utils';
- import { z } from 'zod/v4';
- import { m } from '$lib/paraglide/messages';
- import { settingsService } from '$lib/services/settings-service';
-
- let { data }: { data: PageData } = $props();
- let currentSettings = $state(data.settings);
- let isLoading = $state({ saving: false });
- let showOidcConfigDialog = $state(false);
-
- let oidcConfigForm = $state({
- clientId: '',
- clientSecret: '',
- issuerUrl: '',
- scopes: 'openid email profile',
- adminClaim: '',
- adminValue: ''
- });
-
- // Match the settings form schema and logic
- const formSchema = z
- .object({
- authLocalEnabled: z.boolean(),
- authOidcEnabled: z.boolean(),
- authSessionTimeout: z
- .number(m.security_session_timeout_required())
- .int(m.security_session_timeout_integer())
- .min(15, m.security_session_timeout_min())
- .max(1440, m.security_session_timeout_max()),
- authPasswordPolicy: z.enum(['basic', 'standard', 'strong'])
- })
- .superRefine((val, ctx) => {
- if (data.oidcStatus.envForced) return;
- if (!val.authLocalEnabled && !val.authOidcEnabled) {
- ctx.addIssue({
- code: z.ZodIssueCode.custom,
- message: m.security_enable_one_provider(),
- path: ['authLocalEnabled']
- });
- }
- });
-
- let { inputs: formInputs, ...form } = $derived(createForm<typeof formSchema>(formSchema, currentSettings));
-
- const isOidcActive = () => $formInputs.authOidcEnabled.value || data.oidcStatus.envForced;
-
- function openOidcDialog() {
- if (currentSettings.authOidcConfig) {
- try {
- const cfg = JSON.parse(currentSettings.authOidcConfig);
- oidcConfigForm.clientId = cfg.clientId || '';
- oidcConfigForm.issuerUrl = cfg.issuerUrl || '';
- oidcConfigForm.scopes = cfg.scopes || 'openid email profile';
- oidcConfigForm.adminClaim = cfg.adminClaim || '';
- oidcConfigForm.adminValue = cfg.adminValue || '';
- } catch {}
- }
- oidcConfigForm.clientSecret = '';
- showOidcConfigDialog = true;
- }
-
- function handleOidcSwitchChange(checked: boolean) {
- $formInputs.authOidcEnabled.value = checked;
-
- if (!checked && !$formInputs.authLocalEnabled.value && !data.oidcStatus.envForced) {
- $formInputs.authLocalEnabled.value = true;
- toast.info(m.security_local_enabled_info());
- }
-
- if (checked && !data.oidcStatus.envForced) {
- openOidcDialog();
- }
- }
-
- function handleLocalSwitchChange(checked: boolean) {
- if (!checked && !isOidcActive()) {
- $formInputs.authLocalEnabled.value = true;
- toast.error(m.security_enable_one_provider_error());
- return;
- }
- $formInputs.authLocalEnabled.value = checked;
- }
-
- async function handleSaveOidcConfig() {
- try {
- isLoading.saving = true;
- $formInputs.authOidcEnabled.value = true;
-
- const validated = form.validate();
- if (!validated) {
- isLoading.saving = false;
- return;
- }
-
- const authOidcConfig = JSON.stringify({
- clientId: oidcConfigForm.clientId,
- clientSecret: oidcConfigForm.clientSecret || '',
- issuerUrl: oidcConfigForm.issuerUrl,
- scopes: oidcConfigForm.scopes,
- adminClaim: oidcConfigForm.adminClaim || '',
- adminValue: oidcConfigForm.adminValue || ''
- });
-
- const payload = {
- ...currentSettings,
- authOidcEnabled: true,
- authOidcConfig
- };
-
- await settingsService.updateSettings(payload);
- toast.success(m.security_oidc_saved());
- showOidcConfigDialog = false;
- } finally {
- isLoading.saving = false;
- }
- }
-
- async function handleNext() {
- const validated = form.validate();
- if (!validated) return;
-
- isLoading.saving = true;
- try {
- const payload = {
- ...currentSettings,
- ...validated,
- onboardingCompleted: false,
- onboardingSteps: {
- ...currentSettings.onboardingSteps,
- security: true
- }
- };
-
- await settingsService.updateSettings(payload);
- goto('/onboarding/settings');
- } catch {
- toast.error(m.security_settings_save_failed());
- } finally {
- isLoading.saving = false;
- }
- }
-
- function handleBack() {
- goto('/onboarding/docker');
- }
-
- function handleSkip() {
- goto('/onboarding/settings');
- }
-</script>
-
-<div class="space-y-6">
- <div class="text-center">
- <h2 class="text-2xl font-bold">{m.security_title()}</h2>
- <p class="text-muted-foreground mt-2">{m.security_description()}</p>
- </div>
-
- <form onsubmit={preventDefault(handleNext)} class="space-y-6">
- <FieldSet.Root>
- <FieldSet.Content class="flex flex-col gap-8">
- <div class="min-w-0 space-y-4">
- <h2 class="text-muted-foreground text-sm font-semibold">{m.security_authentication_heading()}</h2>
-
- <SwitchWithLabel
- id="localAuthSwitch"
- label={m.security_local_auth_label()}
- description={m.security_local_auth_description()}
- error={$formInputs.authLocalEnabled.error}
- bind:checked={$formInputs.authLocalEnabled.value}
- onCheckedChange={handleLocalSwitchChange}
- />
-
- <div class="space-y-2">
- <SwitchWithLabel
- id="oidcAuthSwitch"
- label={m.security_oidc_auth_label()}
- description={data.oidcStatus.envForced
- ? m.security_oidc_auth_description_forced()
- : m.security_oidc_auth_description()}
- error={$formInputs.authOidcEnabled.error}
- disabled={data.oidcStatus.envForced}
- checked={$formInputs.authOidcEnabled.value}
- onCheckedChange={handleOidcSwitchChange}
- />
-
- {#if isOidcActive()}
- <div class="pl-11">
- {#if data.oidcStatus.envForced}
- {#if !data.oidcStatus.envConfigured}
- <Button variant="link" class="text-destructive h-auto p-0 text-xs hover:underline" onclick={openOidcDialog}>
- {m.security_server_forces_oidc_missing_env()}
- </Button>
- {:else}
- <Button variant="link" class="h-auto p-0 text-xs text-sky-600 hover:underline" onclick={openOidcDialog}>
- {m.security_oidc_configured_forced_view()}
- </Button>
- {/if}
- {:else}
- <Button variant="link" class="h-auto p-0 text-xs text-sky-600 hover:underline" onclick={openOidcDialog}>
- {m.security_manage_oidc_config()}
- </Button>
- {/if}
- </div>
- {/if}
- </div>
- </div>
-
- <div class="min-w-0 space-y-4">
- <h2 class="text-muted-foreground text-sm font-semibold">{m.security_session_heading()}</h2>
-
- <FormInput
- type="number"
- id="sessionTimeout"
- label={m.security_session_timeout_label()}
- placeholder={m.security_session_timeout_placeholder()}
- bind:input={$formInputs.authSessionTimeout}
- description={m.security_session_timeout_description()}
- />
-
- <div class="space-y-2">
- <span class="text-sm font-medium" id="passwordPolicyLabel">{m.security_password_policy_label()}</span>
- <Tooltip.Provider>
- <div class="mt-2 grid grid-cols-3 gap-2" role="group" aria-labelledby="passwordPolicyLabel">
- <Tooltip.Root>
- <Tooltip.Trigger>
- <Button
- variant={$formInputs.authPasswordPolicy.value === 'basic' ? 'default' : 'outline'}
- class={$formInputs.authPasswordPolicy.value === 'basic'
- ? 'arcane-button-create w-full'
- : 'arcane-button-restart w-full'}
- onclick={() => ($formInputs.authPasswordPolicy.value = 'basic')}
- type="button"
- >{m.common_basic()}
- </Button>
- </Tooltip.Trigger>
- <Tooltip.Content side="top" align="center">{m.security_password_policy_basic_tooltip()}</Tooltip.Content>
- </Tooltip.Root>
-
- <Tooltip.Root>
- <Tooltip.Trigger>
- <Button
- variant={$formInputs.authPasswordPolicy.value === 'standard' ? 'default' : 'outline'}
- class={$formInputs.authPasswordPolicy.value === 'standard'
- ? 'arcane-button-create w-full'
- : 'arcane-button-restart w-full'}
- onclick={() => ($formInputs.authPasswordPolicy.value = 'standard')}
- type="button"
- >{m.security_password_policy_standard()}
- </Button>
- </Tooltip.Trigger>
- <Tooltip.Content side="top" align="center">{m.security_password_policy_standard_tooltip()}</Tooltip.Content>
- </Tooltip.Root>
-
- <Tooltip.Root>
- <Tooltip.Trigger>
- <Button
- variant={$formInputs.authPasswordPolicy.value === 'strong' ? 'default' : 'outline'}
- class={$formInputs.authPasswordPolicy.value === 'strong'
- ? 'arcane-button-create w-full'
- : 'arcane-button-restart w-full'}
- onclick={() => ($formInputs.authPasswordPolicy.value = 'strong')}
- type="button"
- >{m.security_password_policy_strong()}
- </Button>
- </Tooltip.Trigger>
- <Tooltip.Content side="top" align="center">{m.security_password_policy_strong_tooltip()}</Tooltip.Content>
- </Tooltip.Root>
- </div>
- </Tooltip.Provider>
- </div>
- </div>
- </FieldSet.Content>
-
- <FieldSet.Footer>
- <div class="flex w-full place-items-center justify-between">
- <span class="text-muted-foreground text-sm">{m.security_save_instructions()}</span>
- <div class="flex gap-2">
- <Button type="button" variant="outline" onclick={handleBack}>{m.common_back()}</Button>
- <Button type="button" variant="ghost" onclick={handleSkip}>{m.common_skip()}</Button>
- <Button type="submit" disabled={isLoading.saving}>
- {#if isLoading.saving}
- <Spinner class="mr-2 size-4" />
- {/if}
- {m.common_continue?.() ?? 'Continue'}
- </Button>
- </div>
- </div>
- </FieldSet.Footer>
- </FieldSet.Root>
- </form>
-
- <OidcConfigDialog
- bind:open={showOidcConfigDialog}
- {currentSettings}
- oidcStatus={data.oidcStatus}
- bind:oidcForm={oidcConfigForm}
- onSave={handleSaveOidcConfig}
- />
-</div>
diff --git a/frontend/src/routes/onboarding/security/+page.ts b/frontend/src/routes/onboarding/security/+page.ts
deleted file mode 100644
index 9516e385b..000000000
--- a/frontend/src/routes/onboarding/security/+page.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { redirect } from '@sveltejs/kit';
-import type { PageLoad } from './$types';
-import { settingsService } from '$lib/services/settings-service';
-
-export const load: PageLoad = async () => {
- const [settings, oidcStatus] = await Promise.all([
- settingsService.getSettings(),
- settingsService.getOidcStatus().catch(() => ({
- envForced: false,
- envConfigured: false
- }))
- ]);
-
- if (settings.onboardingCompleted) {
- throw redirect(302, '/dashboard');
- }
-
- return { settings, oidcStatus };
-};
diff --git a/frontend/src/routes/onboarding/settings/+page.svelte b/frontend/src/routes/onboarding/settings/+page.svelte
deleted file mode 100644
index 0e48efac0..000000000
--- a/frontend/src/routes/onboarding/settings/+page.svelte
+++ /dev/null
@@ -1,120 +0,0 @@
-<script lang="ts">
- import { Button } from '$lib/components/ui/button';
- import * as FieldSet from '$lib/components/ui/field-set';
- import FormInput from '$lib/components/form/form-input.svelte';
- import SwitchWithLabel from '$lib/components/form/labeled-switch.svelte';
- import { toast } from 'svelte-sonner';
- import { goto } from '$app/navigation';
- import { Spinner } from '$lib/components/ui/spinner/index.js';
- import { createForm, preventDefault } from '$lib/utils/form.utils';
- import { z } from 'zod/v4';
- import { m } from '$lib/paraglide/messages';
- import { settingsService } from '$lib/services/settings-service.js';
-
- let { data } = $props();
- let currentSettings = $state(data.settings);
-
- let isLoading = $state(false);
-
- const formSchema = z.object({
- projectsDirectory: z.string().min(1, m.general_projects_directory_required()),
- baseServerUrl: z.string().min(1, m.general_base_url_required()),
- enableGravatar: z.boolean()
- });
-
- let { inputs: formInputs, ...form } = $derived(createForm<typeof formSchema>(formSchema, currentSettings));
-
- async function handleNext() {
- const validated = form.validate();
- if (!validated) return;
-
- isLoading = true;
-
- try {
- await settingsService.updateSettings({
- ...currentSettings,
- ...validated,
- onboardingCompleted: false,
- onboardingSteps: {
- ...currentSettings.onboardingSteps,
- settings: true
- }
- });
-
- goto('/onboarding/complete');
- } catch (error) {
- toast.error(m.general_settings_save_failed());
- } finally {
- isLoading = false;
- }
- }
-
- function handleSkip() {
- goto('/onboarding/complete');
- }
-</script>
-
-<div class="space-y-6">
- <div class="text-center">
- <h2 class="text-2xl font-bold">{m.general_title()}</h2>
- <p class="text-muted-foreground mt-2">{m.general_description()}</p>
- </div>
-
- <form onsubmit={preventDefault(handleNext)} class="space-y-6">
- <FieldSet.Root>
- <FieldSet.Content class="grid grid-cols-1 gap-6 md:grid-cols-2">
- <div class="bg-background/40 min-w-0 space-y-4 rounded-lg border p-5 shadow-sm">
- <div class="space-y-1">
- <h3 class="text-base font-medium">{m.general_projects_heading()}</h3>
- <p class="text-muted-foreground text-sm">{m.general_projects_description()}</p>
- </div>
-
- <FormInput
- label={m.general_projects_directory_label()}
- placeholder={m.general_projects_directory_placeholder()}
- bind:input={$formInputs.projectsDirectory}
- helpText={m.general_projects_directory_help()}
- />
-
- <FormInput
- label={m.general_base_url_label()}
- placeholder={m.general_base_url_placeholder()}
- bind:input={$formInputs.baseServerUrl}
- helpText={m.general_base_url_help()}
- />
- </div>
-
- <div class="bg-background/40 min-w-0 space-y-4 rounded-lg border p-5 shadow-sm">
- <div class="space-y-1">
- <h3 class="text-base font-medium">{m.general_user_avatars_heading()}</h3>
- <p class="text-muted-foreground text-sm">{m.general_user_avatars_description()}</p>
- </div>
-
- <SwitchWithLabel
- id="enableGravatar"
- label={m.general_enable_gravatar_label()}
- description={m.general_enable_gravatar_description()}
- error={$formInputs.enableGravatar.error}
- bind:checked={$formInputs.enableGravatar.value}
- />
- </div>
- </FieldSet.Content>
-
- <FieldSet.Footer>
- <div class="flex w-full place-items-center justify-between">
- <span class="text-muted-foreground text-sm">{m.general_save_instructions()}</span>
- <div class="flex gap-2">
- <Button type="button" variant="outline" onclick={() => goto('/onboarding/security')}>Back</Button>
- <Button type="button" variant="ghost" onclick={handleSkip}>Skip</Button>
- <Button type="submit" disabled={isLoading}>
- {#if isLoading}
- <Spinner class="mr-2 size-4" />
- {/if}
- {m.common_continue()}
- </Button>
- </div>
- </div>
- </FieldSet.Footer>
- </FieldSet.Root>
- </form>
-</div>
diff --git a/frontend/src/routes/onboarding/settings/+page.ts b/frontend/src/routes/onboarding/settings/+page.ts
deleted file mode 100644
index c7c50c49f..000000000
--- a/frontend/src/routes/onboarding/settings/+page.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { redirect } from '@sveltejs/kit';
-import type { PageLoad } from './$types';
-import { settingsService } from '$lib/services/settings-service';
-
-export const load: PageLoad = async () => {
- const settings = await settingsService.getSettings();
-
- if (settings.onboardingCompleted) {
- throw redirect(302, '/dashboard');
- }
-
- return { settings };
-};
diff --git a/frontend/src/routes/onboarding/welcome/+page.svelte b/frontend/src/routes/onboarding/welcome/+page.svelte
deleted file mode 100644
index d2a5fae2c..000000000
--- a/frontend/src/routes/onboarding/welcome/+page.svelte
+++ /dev/null
@@ -1,70 +0,0 @@
-<script lang="ts">
- import { Button } from '$lib/components/ui/button/index.js';
- import CircleCheckIcon from '@lucide/svelte/icons/check-circle';
- import ChevronRightIcon from '@lucide/svelte/icons/chevron-right';
- import { goto } from '$app/navigation';
- import settingsStore from '$lib/stores/config-store';
- import { settingsService } from '$lib/services/settings-service.js';
-
- let { data } = $props();
- let currentSettings = $state(data.settings);
-
- async function continueToNextStep() {
- await settingsService.updateSettings({
- ...currentSettings,
- onboardingCompleted: false,
- onboardingSteps: {
- ...currentSettings.onboardingSteps,
- welcome: true
- }
- });
-
- settingsStore.reload();
-
- goto('/onboarding/password', { invalidateAll: true });
- }
-</script>
-
-<div class="mx-auto max-w-3xl">
- <h1 class="mb-6 text-3xl font-bold">Welcome to Arcane</h1>
-
- <div class="mb-8 space-y-6">
- <p class="text-xl">Thank you for installing Arcane! Let's get you set up with a few quick steps.</p>
-
- <div class="space-y-4">
- <p class="text-lg font-medium">This wizard will help you:</p>
-
- <div class="space-y-3">
- <div class="flex items-start gap-3">
- <div class="bg-primary/10 mt-0.5 rounded-full p-1">
- <CircleCheckIcon class="text-primary size-4" />
- </div>
- <p>Change the default admin password for security</p>
- </div>
-
- <div class="flex items-start gap-3">
- <div class="bg-primary/10 mt-0.5 rounded-full p-1">
- <CircleCheckIcon class="text-primary size-4" />
- </div>
- <p>Configure your Docker connection</p>
- </div>
-
- <div class="flex items-start gap-3">
- <div class="bg-primary/10 mt-0.5 rounded-full p-1">
- <CircleCheckIcon class="text-primary size-4" />
- </div>
- <p>Set basic application preferences</p>
- </div>
- </div>
-
- <p>This will only take a few minutes to complete.</p>
- </div>
- </div>
-
- <div class="flex justify-center pt-8">
- <Button type="button" onclick={() => continueToNextStep()} class="flex h-12 w-[80%] items-center gap-2 px-8">
- <ChevronRightIcon class="size-4" />
- Continue
- </Button>
- </div>
-</div>
diff --git a/frontend/src/routes/onboarding/welcome/+page.ts b/frontend/src/routes/onboarding/welcome/+page.ts
deleted file mode 100644
index c7c50c49f..000000000
--- a/frontend/src/routes/onboarding/welcome/+page.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { redirect } from '@sveltejs/kit';
-import type { PageLoad } from './$types';
-import { settingsService } from '$lib/services/settings-service';
-
-export const load: PageLoad = async () => {
- const settings = await settingsService.getSettings();
-
- if (settings.onboardingCompleted) {
- throw redirect(302, '/dashboard');
- }
-
- return { settings };
-};
diff --git a/tests/setup/auth.setup.ts b/tests/setup/auth.setup.ts
index 62098427c..01a03175b 100644
--- a/tests/setup/auth.setup.ts
+++ b/tests/setup/auth.setup.ts
@@ -5,11 +5,13 @@ import authUtil from '../utils/auth.util';
const authFile = '.auth/login.json';
setup('authenticate', async ({ page }) => {
- await skipOnboarding();
+ await skipOnboarding(); // Deprecated
await authUtil.login(page);
await page.waitForURL('/dashboard');
+ await authUtil.changeDefaultPassword(page, 'test-password-123');
+
await page.context().storageState({ path: authFile });
});
diff --git a/tests/setup/projects/test-project-1761077902556/compose.yaml b/tests/setup/projects/test-project-1761077902556/compose.yaml
new file mode 100644
index 000000000..48532829c
--- /dev/null
+++ b/tests/setup/projects/test-project-1761077902556/compose.yaml
@@ -0,0 +1,15 @@
+services:
+ nginx:
+ image: nginx:alpine
+ container_name: nginx_service
+ env_file:
+ - .env
+ ports:
+ - "8080:80"
+ volumes:
+ - nginx_data:/usr/share/nginx/html
+ restart: unless-stopped
+
+volumes:
+ nginx_data:
+ driver: local
\ No newline at end of file
diff --git a/tests/utils/auth.util.ts b/tests/utils/auth.util.ts
index ec0708ee6..d63f56741 100644
--- a/tests/utils/auth.util.ts
+++ b/tests/utils/auth.util.ts
@@ -7,4 +7,14 @@ async function login(page: Page) {
await page.getByRole('button', { name: 'Sign in to Arcane', exact: true }).click();
}
-export default { login };
+async function changeDefaultPassword(page: Page, newPassword: string) {
+ const dialog = page.getByRole('dialog', { name: 'Change Default Password' });
+ await dialog.waitFor({ state: 'visible' });
+ await dialog.getByRole('textbox', { name: 'Current Password' }).fill('arcane-admin');
+ await dialog.getByRole('textbox', { name: 'New Password', exact: true }).fill(newPassword);
+ await dialog.getByRole('textbox', { name: 'Confirm New Password' }).fill(newPassword);
+ await dialog.getByRole('button', { name: 'Change Password' }).click();
+ await page.getByRole('listitem').filter({ hasText: 'Password changed successfully' }).waitFor({ state: 'visible' });
+}
+
+export default { login, changeDefaultPassword };