Skip to content

Modern Docker Management, Designed for Everyone

feat: new account page and small ui tweaks and fixes (#2753)

Kyle Mendell526e6d6982a5
diff --git a/backend/api/api.go b/backend/api/api.go
index e78eecca5..40f83d3ec 100644
--- a/backend/api/api.go
+++ b/backend/api/api.go
@@ -143,7 +143,6 @@ type Services struct {
Oidc *services.OidcService
ApiKey *services.ApiKeyService
AppImages *services.ApplicationImagesService
- Font *services.FontService
Project *services.ProjectService
Event *services.EventService
Activity *services.ActivityService
@@ -317,7 +316,6 @@ func registerHandlers(api huma.API, svc *Services) {
var oidcSvc *services.OidcService
var apiKeySvc *services.ApiKeyService
var appImagesSvc *services.ApplicationImagesService
- var fontSvc *services.FontService
var projectSvc *services.ProjectService
var eventSvc *services.EventService
var activitySvc *services.ActivityService
@@ -357,7 +355,6 @@ func registerHandlers(api huma.API, svc *Services) {
oidcSvc = svc.Oidc
apiKeySvc = svc.ApiKey
appImagesSvc = svc.AppImages
- fontSvc = svc.Font
projectSvc = svc.Project
eventSvc = svc.Event
activitySvc = svc.Activity
@@ -396,7 +393,6 @@ func registerHandlers(api huma.API, svc *Services) {
handlers.RegisterApiKeys(api, apiKeySvc)
handlers.RegisterRoles(api, roleSvc)
handlers.RegisterAppImages(api, appImagesSvc)
- handlers.RegisterFonts(api, fontSvc)
handlers.RegisterUsers(api, userSvc, authSvc)
handlers.RegisterProjects(api, projectSvc, activitySvc)
handlers.RegisterVersion(api, versionSvc)
diff --git a/backend/api/api_test.go b/backend/api/api_test.go
index 9caba8008..b366f8e28 100644
--- a/backend/api/api_test.go
+++ b/backend/api/api_test.go
@@ -118,8 +118,6 @@ func TestSetupAPIForSpec_PublicRoutesOverrideSecurity(t *testing.T) {
{path: "/environments/pair", method: "POST"},
{path: "/version", method: "GET"},
{path: "/app-version", method: "GET"},
- {path: "/fonts/sans", method: "GET"},
- {path: "/fonts/mono", method: "GET"},
}
for _, testCase := range testCases {
diff --git a/backend/api/handlers/apikeys.go b/backend/api/handlers/apikeys.go
index 583336a48..5f88573fb 100644
--- a/backend/api/handlers/apikeys.go
+++ b/backend/api/handlers/apikeys.go
@@ -74,6 +74,10 @@ type DeleteApiKeyOutput struct {
Body base.ApiResponse[base.MessageResponse]
}
+type ListMyApiKeysOutput struct {
+ Body base.ApiResponse[[]apikey.ApiKey]
+}
+
// RegisterApiKeys registers API key management routes using Huma.
func RegisterApiKeys(api huma.API, apiKeyService *services.ApiKeyService) {
h := &ApiKeyHandler{
@@ -149,6 +153,47 @@ func RegisterApiKeys(api huma.API, apiKeyService *services.ApiKeyService) {
},
Middlewares: humamw.RequirePermission(api, authz.PermApiKeysDelete),
}, h.DeleteApiKey)
+
+ // Self-service endpoints — no admin permission required, scoped to the
+ // caller's own keys via current-user context.
+ huma.Register(api, huma.Operation{
+ OperationID: "list-my-api-keys",
+ Method: http.MethodGet,
+ Path: "/auth/me/api-keys",
+ Summary: "List my API keys",
+ Description: "List API keys owned by the current user",
+ Tags: []string{"API Keys"},
+ Security: []map[string][]string{
+ {"BearerAuth": {}},
+ {"ApiKeyAuth": {}},
+ },
+ }, h.ListMyApiKeys)
+
+ huma.Register(api, huma.Operation{
+ OperationID: "create-my-api-key",
+ Method: http.MethodPost,
+ Path: "/auth/me/api-keys",
+ Summary: "Create my API key",
+ Description: "Create a new API key owned by the current user",
+ Tags: []string{"API Keys"},
+ Security: []map[string][]string{
+ {"BearerAuth": {}},
+ {"ApiKeyAuth": {}},
+ },
+ }, h.CreateMyApiKey)
+
+ huma.Register(api, huma.Operation{
+ OperationID: "delete-my-api-key",
+ Method: http.MethodDelete,
+ Path: "/auth/me/api-keys/{id}",
+ Summary: "Delete my API key",
+ Description: "Delete one of the current user's own API keys",
+ Tags: []string{"API Keys"},
+ Security: []map[string][]string{
+ {"BearerAuth": {}},
+ {"ApiKeyAuth": {}},
+ },
+ }, h.DeleteMyApiKey)
}
// ListApiKeys returns a paginated list of API keys.
@@ -295,3 +340,95 @@ func (h *ApiKeyHandler) DeleteApiKey(ctx context.Context, input *DeleteApiKeyInp
},
}, nil
}
+
+// ListMyApiKeys lists API keys owned by the current user (self-service).
+func (h *ApiKeyHandler) ListMyApiKeys(ctx context.Context, input *struct{}) (*ListMyApiKeysOutput, error) {
+ if h.apiKeyService == nil {
+ return nil, huma.Error500InternalServerError("service not available")
+ }
+
+ user, exists := humamw.GetCurrentUserFromContext(ctx)
+ if !exists {
+ return nil, huma.Error401Unauthorized((&common.NotAuthenticatedError{}).Error())
+ }
+
+ keys, err := h.apiKeyService.ListApiKeysByUser(ctx, user.ID)
+ if err != nil {
+ return nil, huma.Error500InternalServerError((&common.ApiKeyListError{Err: err}).Error())
+ }
+
+ return &ListMyApiKeysOutput{
+ Body: base.ApiResponse[[]apikey.ApiKey]{
+ Success: true,
+ Data: keys,
+ },
+ }, nil
+}
+
+// CreateMyApiKey creates a new API key owned by the current user (self-service).
+func (h *ApiKeyHandler) CreateMyApiKey(ctx context.Context, input *CreateApiKeyInput) (*CreateApiKeyOutput, error) {
+ if h.apiKeyService == nil {
+ return nil, huma.Error500InternalServerError("service not available")
+ }
+
+ user, exists := humamw.GetCurrentUserFromContext(ctx)
+ if !exists {
+ return nil, huma.Error401Unauthorized((&common.NotAuthenticatedError{}).Error())
+ }
+
+ apiKey, err := h.apiKeyService.CreateApiKey(ctx, user.ID, input.Body)
+ if err != nil {
+ if errors.Is(err, services.ErrApiKeyPermissionEscalation) {
+ return nil, huma.Error403Forbidden(err.Error())
+ }
+ return nil, huma.Error500InternalServerError((&common.ApiKeyCreationError{Err: err}).Error())
+ }
+
+ return &CreateApiKeyOutput{
+ Body: base.ApiResponse[apikey.ApiKeyCreatedDto]{
+ Success: true,
+ Data: *apiKey,
+ },
+ }, nil
+}
+
+// DeleteMyApiKey deletes one of the current user's API keys, validating
+// ownership before removal so the endpoint can't be used to delete other
+// users' keys.
+func (h *ApiKeyHandler) DeleteMyApiKey(ctx context.Context, input *DeleteApiKeyInput) (*DeleteApiKeyOutput, error) {
+ if h.apiKeyService == nil {
+ return nil, huma.Error500InternalServerError("service not available")
+ }
+
+ user, exists := humamw.GetCurrentUserFromContext(ctx)
+ if !exists {
+ return nil, huma.Error401Unauthorized((&common.NotAuthenticatedError{}).Error())
+ }
+
+ existing, err := h.apiKeyService.GetApiKey(ctx, input.ID)
+ if err != nil {
+ return nil, huma.Error404NotFound((&common.ApiKeyNotFoundError{}).Error())
+ }
+ if existing.UserID == nil || *existing.UserID != user.ID {
+ return nil, huma.Error404NotFound((&common.ApiKeyNotFoundError{}).Error())
+ }
+
+ if err := h.apiKeyService.DeleteApiKey(ctx, input.ID); err != nil {
+ if errors.Is(err, services.ErrApiKeyNotFound) {
+ return nil, huma.Error404NotFound((&common.ApiKeyNotFoundError{}).Error())
+ }
+ if errors.Is(err, services.ErrApiKeyProtected) {
+ return nil, huma.Error403Forbidden("this API key cannot be deleted")
+ }
+ return nil, huma.Error500InternalServerError((&common.ApiKeyDeletionError{Err: err}).Error())
+ }
+
+ return &DeleteApiKeyOutput{
+ Body: base.ApiResponse[base.MessageResponse]{
+ Success: true,
+ Data: base.MessageResponse{
+ Message: "API key deleted successfully",
+ },
+ },
+ }, nil
+}
diff --git a/backend/api/handlers/auth.go b/backend/api/handlers/auth.go
index b5abec851..598582f6c 100644
--- a/backend/api/handlers/auth.go
+++ b/backend/api/handlers/auth.go
@@ -59,6 +59,22 @@ type ChangePasswordOutput struct {
Body base.ApiResponse[base.MessageResponse]
}
+type LogoutAllOtherSessionsOutput struct {
+ Body base.ApiResponse[base.MessageResponse]
+}
+
+type UpdateMyProfileInput struct {
+ Body struct {
+ DisplayName *string `json:"displayName,omitempty"`
+ Email *string `json:"email,omitempty"`
+ Locale *string `json:"locale,omitempty"`
+ }
+}
+
+type UpdateMyProfileOutput struct {
+ Body base.ApiResponse[user.User]
+}
+
type GetCurrentUserOutput struct {
Body base.ApiResponse[user.User]
}
@@ -126,6 +142,32 @@ func RegisterAuth(api huma.API, userService *services.UserService, authService *
{"ApiKeyAuth": {}},
},
}, h.ChangePassword)
+
+ huma.Register(api, huma.Operation{
+ OperationID: "logout-all-other-sessions",
+ Method: http.MethodPost,
+ Path: "/auth/sessions/logout-all",
+ Summary: "Logout all other sessions",
+ Description: "Revoke every session for the current user except the one making this request",
+ Tags: []string{"Auth"},
+ Security: []map[string][]string{
+ {"BearerAuth": {}},
+ {"ApiKeyAuth": {}},
+ },
+ }, h.LogoutAllOtherSessions)
+
+ huma.Register(api, huma.Operation{
+ OperationID: "update-my-profile",
+ Method: http.MethodPut,
+ Path: "/auth/me/profile",
+ Summary: "Update own profile",
+ Description: "Update the current user's display name and email. Forbidden for OIDC-managed accounts.",
+ Tags: []string{"Auth"},
+ Security: []map[string][]string{
+ {"BearerAuth": {}},
+ {"ApiKeyAuth": {}},
+ },
+ }, h.UpdateMyProfile)
}
// Login authenticates a user and returns tokens.
@@ -305,3 +347,85 @@ func (h *AuthHandler) ChangePassword(ctx context.Context, input *ChangePasswordI
},
}, nil
}
+
+// LogoutAllOtherSessions revokes every active session for the current user
+// except the session making this request.
+func (h *AuthHandler) LogoutAllOtherSessions(ctx context.Context, input *struct{}) (*LogoutAllOtherSessionsOutput, error) {
+ if h.authService == nil {
+ return nil, huma.Error500InternalServerError("service not available")
+ }
+
+ userModel, exists := humamw.GetCurrentUserFromContext(ctx)
+ if !exists {
+ return nil, huma.Error401Unauthorized((&common.NotAuthenticatedError{}).Error())
+ }
+
+ currentSessionID, _ := humamw.GetCurrentSessionIDFromContext(ctx)
+ if err := h.authService.LogoutAllOtherSessions(ctx, userModel.ID, currentSessionID); err != nil {
+ return nil, huma.Error500InternalServerError("failed to revoke sessions: " + err.Error())
+ }
+
+ return &LogoutAllOtherSessionsOutput{
+ Body: base.ApiResponse[base.MessageResponse]{
+ Success: true,
+ Data: base.MessageResponse{
+ Message: "All other sessions signed out",
+ },
+ },
+ }, nil
+}
+
+// UpdateMyProfile lets the current user update their own displayName and email.
+// OIDC-managed accounts are read-only here.
+func (h *AuthHandler) UpdateMyProfile(ctx context.Context, input *UpdateMyProfileInput) (*UpdateMyProfileOutput, error) {
+ if h.userService == nil {
+ return nil, huma.Error500InternalServerError("service not available")
+ }
+
+ currentUser, exists := humamw.GetCurrentUserFromContext(ctx)
+ if !exists {
+ return nil, huma.Error401Unauthorized((&common.NotAuthenticatedError{}).Error())
+ }
+
+ isOidcUser := currentUser.OidcSubjectId != nil && *currentUser.OidcSubjectId != ""
+ touchesIdpFields := input.Body.DisplayName != nil || input.Body.Email != nil
+ if isOidcUser && touchesIdpFields {
+ return nil, huma.Error403Forbidden("display name and email are managed by your identity provider")
+ }
+
+ userModel, err := h.userService.GetUser(ctx, currentUser.ID)
+ if err != nil {
+ return nil, huma.Error500InternalServerError((&common.UserRetrievalError{Err: err}).Error())
+ }
+
+ if input.Body.DisplayName != nil {
+ userModel.DisplayName = input.Body.DisplayName
+ }
+ if input.Body.Email != nil {
+ normalized, err := normalizeOptionalEmailInternal(input.Body.Email)
+ if err != nil {
+ return nil, huma.Error400BadRequest(err.Error())
+ }
+ userModel.Email = normalized
+ }
+ if input.Body.Locale != nil {
+ userModel.Locale = input.Body.Locale
+ }
+
+ updated, err := h.userService.UpdateUser(ctx, userModel)
+ if err != nil {
+ return nil, huma.Error500InternalServerError((&common.UserUpdateError{Err: err}).Error())
+ }
+
+ out, err := h.userService.ToUserResponseDto(ctx, *updated)
+ if err != nil {
+ return nil, huma.Error500InternalServerError((&common.UserMappingError{Err: err}).Error())
+ }
+
+ return &UpdateMyProfileOutput{
+ Body: base.ApiResponse[user.User]{
+ Success: true,
+ Data: out,
+ },
+ }, nil
+}
diff --git a/backend/api/handlers/fonts.go b/backend/api/handlers/fonts.go
deleted file mode 100644
index 137ae7500..000000000
--- a/backend/api/handlers/fonts.go
+++ /dev/null
@@ -1,88 +0,0 @@
-package handlers
-
-import (
- "context"
- "net/http"
-
- "github.com/danielgtaylor/huma/v2"
- "github.com/getarcaneapp/arcane/backend/internal/services"
-)
-
-// FontsHandler provides Huma-based font endpoints.
-type FontsHandler struct {
- fontService *services.FontService
-}
-
-// --- Huma Input/Output Wrappers ---
-
-type GetFontOutput struct {
- ContentType string `header:"Content-Type"`
- CacheControl string `header:"Cache-Control"`
- Body []byte
-}
-
-// RegisterFonts registers font routes using Huma.
-func RegisterFonts(api huma.API, fontService *services.FontService) {
- h := &FontsHandler{
- fontService: fontService,
- }
-
- huma.Register(api, huma.Operation{
- OperationID: "get-sans-font",
- Method: http.MethodGet,
- Path: "/fonts/sans",
- Summary: "Get sans-serif font",
- Description: "Get the application sans-serif font (Mona Sans)",
- Tags: []string{"Fonts"},
- Security: []map[string][]string{}, // Public endpoint
- }, h.GetSansFont)
-
- huma.Register(api, huma.Operation{
- OperationID: "get-mono-font",
- Method: http.MethodGet,
- Path: "/fonts/mono",
- Summary: "Get monospace font",
- Description: "Get the application monospace font (Mona Sans Mono)",
- Tags: []string{"Fonts"},
- Security: []map[string][]string{}, // Public endpoint
- }, h.GetMonoFont)
-}
-
-// GetSansFont returns the sans-serif font.
-func (h *FontsHandler) GetSansFont(ctx context.Context, input *struct{}) (*GetFontOutput, error) {
- if h.fontService == nil {
- return nil, huma.Error500InternalServerError("service not available")
- }
-
- data, mimeType, err := h.fontService.GetSansFont()
- if err != nil {
- return nil, huma.Error404NotFound("font not found")
- }
-
- return h.createFontResponse(data, mimeType), nil
-}
-
-// GetMonoFont returns the monospace font.
-func (h *FontsHandler) GetMonoFont(ctx context.Context, input *struct{}) (*GetFontOutput, error) {
- if h.fontService == nil {
- return nil, huma.Error500InternalServerError("service not available")
- }
-
- data, mimeType, err := h.fontService.GetMonoFont()
- if err != nil {
- return nil, huma.Error404NotFound("font not found")
- }
-
- return h.createFontResponse(data, mimeType), nil
-}
-
-func (h *FontsHandler) createFontResponse(data []byte, mimeType string) *GetFontOutput {
- // Cache for 1 year, immutable
- cacheControl := "public, max-age=31536000, immutable"
-
- return &GetFontOutput{
- ContentType: mimeType,
- CacheControl: cacheControl,
- Body: data,
- }
-}
diff --git a/backend/internal/bootstrap/router_bootstrap.go b/backend/internal/bootstrap/router_bootstrap.go
index e0177ee2c..726b7ee0e 100644
--- a/backend/internal/bootstrap/router_bootstrap.go
+++ b/backend/internal/bootstrap/router_bootstrap.go
@@ -37,8 +37,6 @@ var loggerSkipPatterns = []string{
"GET /api/environments/*/ws/system/stats",
"GET /_app/*",
"GET /img",
- "GET /api/fonts/sans",
- "GET /api/fonts/mono",
"GET /api/health",
"HEAD /api/health",
// Static branding / PWA assets — browsers re-request these frequently
@@ -191,7 +189,6 @@ func setupRouter(ctx context.Context, cfg *config.Config, appServices *Services)
Oidc: appServices.Oidc,
ApiKey: appServices.ApiKey,
AppImages: appServices.AppImages,
- Font: appServices.Font,
Project: appServices.Project,
Event: appServices.Event,
Activity: appServices.Activity,
diff --git a/backend/internal/bootstrap/services_bootstrap.go b/backend/internal/bootstrap/services_bootstrap.go
index fb7272674..ec9899c10 100644
--- a/backend/internal/bootstrap/services_bootstrap.go
+++ b/backend/internal/bootstrap/services_bootstrap.go
@@ -47,7 +47,6 @@ type Services struct {
GitRepository *services.GitRepositoryService
GitOpsSync *services.GitOpsSyncService
Webhook *services.WebhookService
- Font *services.FontService
Vulnerability *services.VulnerabilityService
Dashboard *services.DashboardService
Role *services.RoleService
@@ -67,7 +66,6 @@ func initializeServices(ctx context.Context, db *database.DB, cfg *config.Config
svcs.SettingsSearch = services.NewSettingsSearchService()
svcs.CustomizeSearch = services.NewCustomizeSearchService()
svcs.AppImages = services.NewApplicationImagesService(resources.FS, svcs.Settings)
- svcs.Font = services.NewFontService(resources.FS)
dockerClient := services.NewDockerClientService(ctx, db, cfg, svcs.Settings)
svcs.Docker = dockerClient
svcs.Role = services.NewRoleService(db)
diff --git a/backend/internal/services/api_key_service.go b/backend/internal/services/api_key_service.go
index 183d5977d..57d602857 100644
--- a/backend/internal/services/api_key_service.go
+++ b/backend/internal/services/api_key_service.go
@@ -481,6 +481,27 @@ func (s *ApiKeyService) ListApiKeys(ctx context.Context, params pagination.Query
return result, paginationResp, nil
}
+// ListApiKeysByUser returns every non-static, non-bootstrap API key owned by
+// userID. Used by the self-service personal-keys flow.
+func (s *ApiKeyService) ListApiKeysByUser(ctx context.Context, userID string) ([]apikey.ApiKey, error) {
+ var apiKeys []models.ApiKey
+ if err := s.db.WithContext(ctx).
+ Where("user_id = ?", userID).
+ Order("created_at DESC").
+ Find(&apiKeys).Error; err != nil {
+ return nil, fmt.Errorf("failed to list user api keys: %w", err)
+ }
+
+ result := make([]apikey.ApiKey, 0, len(apiKeys))
+ for i := range apiKeys {
+ if isStaticAPIKeyInternal(apiKeys[i]) || isEnvironmentBootstrapKeyInternal(apiKeys[i]) {
+ continue
+ }
+ result = append(result, s.toAPIKeyDTOWithPermissionsInternal(ctx, &apiKeys[i]))
+ }
+ return result, nil
+}
+
func (s *ApiKeyService) UpdateApiKey(ctx context.Context, callerUserID, id string, req apikey.UpdateApiKey) (*apikey.ApiKey, error) {
var ak models.ApiKey
if err := s.db.WithContext(ctx).Where("id = ?", id).First(&ak).Error; err != nil {
diff --git a/backend/internal/services/auth_service.go b/backend/internal/services/auth_service.go
index 6537b39cc..d4290d3c9 100644
--- a/backend/internal/services/auth_service.go
+++ b/backend/internal/services/auth_service.go
@@ -813,6 +813,18 @@ func (s *AuthService) RevokeSession(ctx context.Context, sessionID string) error
return s.sessionService.RevokeSession(ctx, sessionID)
}
+// LogoutAllOtherSessions revokes every active session for userID except
+// currentSessionID, so the caller stays signed in on their current device.
+func (s *AuthService) LogoutAllOtherSessions(ctx context.Context, userID, currentSessionID string) error {
+ if s.sessionService == nil {
+ return nil
+ }
+ s.tokenCache.DeleteFunc(func(_ string, e verifiedTokenEntry) bool {
+ return e.User.ID == userID && e.SessionID != currentSessionID
+ })
+ return s.sessionService.RevokeAllUserSessionsExcept(ctx, userID, currentSessionID)
+}
+
func (s *AuthService) createSessionAndTokensInternal(ctx context.Context, user *models.User, meta auth.SessionMeta) (*TokenPair, error) {
if s.sessionService == nil {
return nil, &common.SessionServiceUnavailableError{}
diff --git a/backend/internal/services/font_service.go b/backend/internal/services/font_service.go
deleted file mode 100644
index 547bfe4e2..000000000
--- a/backend/internal/services/font_service.go
+++ /dev/null
@@ -1,65 +0,0 @@
-package services
-
-import (
- "embed"
- "errors"
- "fmt"
- "io/fs"
- "mime"
- "path/filepath"
- "strings"
-)
-
-type FontService struct {
- fs embed.FS
-}
-
-func NewFontService(embeddedFS embed.FS) *FontService {
- return &FontService{
- fs: embeddedFS,
- }
-}
-
-func (s *FontService) GetSansFont() ([]byte, string, error) {
- return s.GetFont("Mona/MonaSans.woff2")
-}
-
-func (s *FontService) GetMonoFont() ([]byte, string, error) {
- return s.GetFont("Mona/MonaSansMono.woff2")
-}
-
-func (s *FontService) GetFont(fontPath string) ([]byte, string, error) {
- // Prevent directory traversal
- if strings.Contains(fontPath, "..") {
- return nil, "", fmt.Errorf("invalid font path")
- }
-
- // The fonts are located in "fonts" directory in the embedded FS
- fullPath := filepath.Join("fonts", fontPath)
-
- data, err := s.fs.ReadFile(fullPath)
- if err != nil {
- if errors.Is(err, fs.ErrNotExist) {
- return nil, "", fmt.Errorf("font not found")
- }
- return nil, "", err
- }
-
- ext := filepath.Ext(fontPath)
- mimeType := mime.TypeByExtension(ext)
- if mimeType == "" {
- // Fallback for common font types if mime package doesn't detect them
- switch strings.ToLower(ext) {
- case ".woff2":
- mimeType = "font/woff2"
- case ".ttf":
- mimeType = "font/ttf"
- case ".otf":
- mimeType = "font/otf"
- default:
- mimeType = "application/octet-stream"
- }
- }
-
- return data, mimeType, nil
-}
diff --git a/backend/resources/embed.go b/backend/resources/embed.go
index d2d103ac6..48d373839 100644
--- a/backend/resources/embed.go
+++ b/backend/resources/embed.go
@@ -4,5 +4,5 @@ import "embed"
// Embedded file systems for the project
-//go:embed migrations images email-templates fonts
+//go:embed migrations images email-templates
var FS embed.FS
diff --git a/backend/resources/fonts/Mona/MonaSans.woff2 b/backend/resources/fonts/Mona/MonaSans.woff2
deleted file mode 100644
index 904b96b4b..000000000
Binary files a/backend/resources/fonts/Mona/MonaSans.woff2 and /dev/null differ
diff --git a/backend/resources/fonts/Mona/MonaSansMono.woff2 b/backend/resources/fonts/Mona/MonaSansMono.woff2
deleted file mode 100644
index 2cf264bf2..000000000
Binary files a/backend/resources/fonts/Mona/MonaSansMono.woff2 and /dev/null differ
diff --git a/cli/internal/types/endpoints.go b/cli/internal/types/endpoints.go
index 3aa235b05..6f603d035 100644
--- a/cli/internal/types/endpoints.go
+++ b/cli/internal/types/endpoints.go
@@ -150,8 +150,6 @@ type ArcaneApiEndpoints struct {
AppImagesFaviconEndpoint string
AppImagesLogoEndpoint string
AppImagesProfileEndpoint string
- FontsMonoEndpoint string
- FontsSansEndpoint string
// Customization
CustomizeCategoriesEndpoint string
@@ -321,8 +319,6 @@ var Endpoints = ArcaneApiEndpoints{ //nolint:gosec // static endpoint paths; aut
AppImagesFaviconEndpoint: "/api/app-images/favicon",
AppImagesLogoEndpoint: "/api/app-images/logo",
AppImagesProfileEndpoint: "/api/app-images/profile",
- FontsMonoEndpoint: "/api/fonts/mono",
- FontsSansEndpoint: "/api/fonts/sans",
// Customization
CustomizeCategoriesEndpoint: "/api/customize/categories",
diff --git a/frontend/package.json b/frontend/package.json
index 8a79a1139..6b87868ec 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -22,6 +22,8 @@
"@codemirror/merge": "^6.12.1",
"@codemirror/state": "^6.6.0",
"@codemirror/view": "^6.43.0",
+ "@fontsource-variable/geist-mono": "^5.2.8",
+ "@fontsource-variable/montserrat": "^5.2.8",
"@lezer/highlight": "^1.2.3",
"@sveltejs/adapter-static": "^3.0.10",
"@sveltejs/kit": "^2.61.1",
diff --git a/frontend/src/app.css b/frontend/src/app.css
index 296dd55a2..10eb108cf 100644
--- a/frontend/src/app.css
+++ b/frontend/src/app.css
@@ -1,67 +1,43 @@
@import 'tailwindcss';
@import 'tw-animate-css';
+@import '@fontsource-variable/montserrat';
+@import '@fontsource-variable/geist-mono';
-@variant dark (&:where(.dark, .dark *));
-
-@font-face {
- font-family: 'Mona Sans';
- src: url('/api/fonts/sans') format('woff2');
- font-weight: 200 900;
- font-display: swap;
- font-style: normal;
-}
-
-@font-face {
- font-family: 'Mona Sans Mono';
- src: url('/api/fonts/mono') format('woff2');
- font-weight: 200 900;
- font-display: swap;
- font-style: normal;
-}
-
-@layer base {
- *,
- ::after,
- ::before,
- ::backdrop,
- ::file-selector-button {
- border-color: var(--color-gray-200, currentcolor);
- }
-}
+@custom-variant dark (&:is(.dark *));
/* BASE THEMES */
:root {
- --radius: 0.65rem;
+ --radius: 0.6rem;
--background: oklch(1 0 0);
- --foreground: oklch(0.141 0.005 285.823);
- --card: oklch(1 0 0 / 0.6);
- --card-foreground: oklch(0.141 0.005 285.823);
+ --foreground: oklch(0.145 0 0);
+ --card: oklch(1 0 0);
+ --card-foreground: oklch(0.145 0 0);
--popover: oklch(1 0 0);
- --popover-foreground: oklch(0.141 0.005 285.823);
+ --popover-foreground: oklch(0.145 0 0);
--primary: oklch(0.606 0.25 292.717);
- --primary-foreground: oklch(0.141 0.005 285.823);
- --secondary: oklch(0.967 0.001 286.375 / 0.6);
+ --primary-foreground: oklch(0.969 0.016 293.756);
+ --secondary: oklch(0.967 0.001 286.375);
--secondary-foreground: oklch(0.21 0.006 285.885);
- --muted: oklch(0.967 0.001 286.375 / 0.6);
- --muted-foreground: oklch(0.552 0.016 285.938);
- --accent: oklch(0.967 0.001 286.375 / 0.6);
- --accent-foreground: oklch(0.21 0.006 285.885);
+ --muted: oklch(0.97 0 0);
+ --muted-foreground: oklch(0.556 0 0);
+ --accent: oklch(0.97 0 0);
+ --accent-foreground: oklch(0.205 0 0);
--destructive: oklch(0.577 0.245 27.325);
- --border: oklch(0.92 0.004 286.32);
- --input: oklch(0.92 0.004 286.32);
+ --border: oklch(0.922 0 0);
+ --input: oklch(0.922 0 0);
--ring: oklch(0.606 0.25 292.717);
- --chart-1: oklch(0.646 0.222 41.116);
- --chart-2: oklch(0.6 0.118 184.704);
- --chart-3: oklch(0.398 0.07 227.392);
- --chart-4: oklch(0.828 0.189 84.429);
- --chart-5: oklch(0.769 0.188 70.08);
- --sidebar: oklch(0.985 0 0 / 0.6);
- --sidebar-foreground: oklch(0.141 0.005 285.823);
+ --chart-1: oklch(0.811 0.111 293.571);
+ --chart-2: oklch(0.606 0.25 292.717);
+ --chart-3: oklch(0.541 0.281 293.009);
+ --chart-4: oklch(0.491 0.27 292.581);
+ --chart-5: oklch(0.432 0.232 292.759);
+ --sidebar: oklch(0.985 0 0);
+ --sidebar-foreground: oklch(0.145 0 0);
--sidebar-primary: oklch(0.606 0.25 292.717);
--sidebar-primary-foreground: oklch(0.969 0.016 293.756);
- --sidebar-accent: oklch(0.967 0.001 286.375 / 0.6);
- --sidebar-accent-foreground: oklch(0.21 0.006 285.885);
- --sidebar-border: oklch(0.92 0.004 286.32);
+ --sidebar-accent: oklch(0.97 0 0);
+ --sidebar-accent-foreground: oklch(0.205 0 0);
+ --sidebar-border: oklch(0.922 0 0);
--sidebar-ring: oklch(0.606 0.25 292.717);
--surface: oklch(0.985 0.006 285.885);
--bg-surface: var(--surface);
@@ -73,40 +49,40 @@
}
.dark {
- --background: oklch(0.141 0.005 285.823);
+ --background: oklch(0.145 0 0);
--foreground: oklch(0.985 0 0);
- --card: oklch(0.21 0.006 285.885 / 0.6);
+ --card: oklch(0.205 0 0);
--card-foreground: oklch(0.985 0 0);
- --popover: oklch(0.21 0.006 285.885);
+ --popover: oklch(0.205 0 0);
--popover-foreground: oklch(0.985 0 0);
--primary: oklch(0.541 0.281 293.009);
--primary-foreground: oklch(0.969 0.016 293.756);
- --secondary: oklch(0.274 0.006 286.033 / 0.55);
+ --secondary: oklch(0.274 0.006 286.033);
--secondary-foreground: oklch(0.985 0 0);
- --muted: oklch(0.274 0.006 286.033 / 0.55);
- --muted-foreground: oklch(0.705 0.015 286.067);
- --accent: oklch(0.274 0.006 286.033 / 0.55);
+ --muted: oklch(0.269 0 0);
+ --muted-foreground: oklch(0.708 0 0);
+ --accent: oklch(0.269 0 0);
--accent-foreground: oklch(0.985 0 0);
--destructive: oklch(0.704 0.191 22.216);
--border: oklch(1 0 0 / 10%);
--input: oklch(1 0 0 / 15%);
--ring: oklch(0.541 0.281 293.009);
- --chart-1: oklch(0.488 0.243 264.376);
- --chart-2: oklch(0.696 0.17 162.48);
- --chart-3: oklch(0.769 0.188 70.08);
- --chart-4: oklch(0.627 0.265 303.9);
- --chart-5: oklch(0.645 0.246 16.439);
- --sidebar: oklch(0.21 0.006 285.885 / 0.6);
+ --chart-1: oklch(0.811 0.111 293.571);
+ --chart-2: oklch(0.606 0.25 292.717);
+ --chart-3: oklch(0.541 0.281 293.009);
+ --chart-4: oklch(0.491 0.27 292.581);
+ --chart-5: oklch(0.432 0.232 292.759);
+ --sidebar: oklch(0.205 0 0);
--sidebar-foreground: oklch(0.985 0 0);
--sidebar-primary: oklch(0.541 0.281 293.009);
--sidebar-primary-foreground: oklch(0.969 0.016 293.756);
- --sidebar-accent: oklch(0.274 0.006 286.033 / 0.55);
+ --sidebar-accent: oklch(0.269 0 0);
--sidebar-accent-foreground: oklch(0.985 0 0);
--sidebar-border: oklch(1 0 0 / 10%);
--sidebar-ring: oklch(0.541 0.281 293.009);
- --surface: oklch(0.21 0.006 285.885);
+ --surface: oklch(0.205 0 0);
- --bg-surface: oklch(0.21 0.006 285.885);
+ --bg-surface: oklch(0.205 0 0);
--glass-base: var(--bg-surface);
--glass-tint: var(--primary);
--glass-shadow-color: oklch(0 0 0 / 0.32);
@@ -611,10 +587,13 @@
}
@theme inline {
- --radius-sm: calc(var(--radius) - 4px);
- --radius-md: calc(var(--radius) - 2px);
+ --radius-sm: calc(var(--radius) * 0.6);
+ --radius-md: calc(var(--radius) * 0.8);
--radius-lg: var(--radius);
- --radius-xl: calc(var(--radius) + 4px);
+ --radius-xl: calc(var(--radius) * 1.4);
+ --radius-2xl: calc(var(--radius) * 1.8);
+ --radius-3xl: calc(var(--radius) * 2.2);
+ --radius-4xl: calc(var(--radius) * 2.6);
--color-background: var(--background);
--color-foreground: var(--foreground);
@@ -646,13 +625,14 @@
--color-sidebar-ring: var(--sidebar-ring);
--color-surface: var(--surface);
- --font-sans: 'Mona Sans', system-ui, sans-serif;
- --font-mono: 'Mona Sans Mono', monospace;
+ --font-sans: 'Montserrat Variable', sans-serif;
+ --font-heading: 'Geist Mono Variable', monospace;
+ --font-mono: 'Geist Mono Variable', monospace;
}
@layer base {
* {
- @apply border-border;
+ @apply border-border outline-ring/50;
}
body {
@@ -662,6 +642,12 @@
-moz-osx-font-smoothing: auto;
text-rendering: optimizeLegibility;
}
+
+ html {
+ @apply font-sans;
+ font-size: 14px;
+ }
+
button {
@apply cursor-pointer;
}
diff --git a/frontend/src/lib/components/locale-picker.svelte b/frontend/src/lib/components/locale-picker.svelte
index 8854e316f..85199aedd 100644
--- a/frontend/src/lib/components/locale-picker.svelte
+++ b/frontend/src/lib/components/locale-picker.svelte
@@ -52,7 +52,7 @@
const updateLocaleMutation = createMutation(() => ({
mutationFn: async (locale: Locale) => {
if ($userStore) {
- await userService.update($userStore.id, { locale });
+ await userService.updateMyProfile({ locale });
}
await setLocale(locale);
return locale;
diff --git a/frontend/src/lib/components/sidebar/sidebar-user.svelte b/frontend/src/lib/components/sidebar/sidebar-user.svelte
index 4e8adcf10..13a1cf379 100644
--- a/frontend/src/lib/components/sidebar/sidebar-user.svelte
+++ b/frontend/src/lib/components/sidebar/sidebar-user.svelte
@@ -2,22 +2,21 @@
import * as Avatar from '$lib/components/ui/avatar/index.js';
import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
import * as Sidebar from '$lib/components/ui/sidebar/index.js';
- import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { useSidebar } from '$lib/components/ui/sidebar/index.js';
import type { User } from '$lib/types/auth';
- import { mode, toggleMode } from 'mode-watcher';
- import { cn } from '$lib/utils';
import settingsStore from '$lib/stores/config-store';
- import { m } from '$lib/paraglide/messages';
- import LocalePicker from '$lib/components/locale-picker.svelte';
import { getDefaultProfilePicture } from '$lib/utils/docker';
- import { SunIcon, MoonIcon } from '$lib/icons';
+ import { goto } from '$app/navigation';
+ import { LogoutIcon, UserIcon } from '$lib/icons';
- let { user, isCollapsed }: { user: User; isCollapsed: boolean } = $props();
+ let {
+ user,
+ isCollapsed,
+ autoLoginEnabled = false
+ }: { user: User; isCollapsed: boolean; autoLoginEnabled?: boolean } = $props();
const sidebar = useSidebar();
let dropdownOpen = $state(false);
- let localePickerOpen = $state(false);
$effect(() => {
if (sidebar.state === 'collapsed' && !sidebar.isHovered && dropdownOpen) {
@@ -78,8 +77,7 @@
{/snippet}
</DropdownMenu.Trigger>
<DropdownMenu.Content
- class="border-border/20 min-w-56 rounded-2xl border p-0 shadow-lg backdrop-blur-2xl
- backdrop-saturate-150"
+ class="border-border/30 min-w-60 rounded-xl border p-1.5 shadow-lg backdrop-blur-2xl backdrop-saturate-150"
side="right"
align="end"
sideOffset={12}
@@ -93,70 +91,59 @@
}
}}
onmouseleave={() => {
- if (!localePickerOpen) {
- sidebar.setHovered(false, 150);
- }
+ sidebar.setHovered(false, 150);
}}
>
- <DropdownMenu.Label class="border-border/10 border-b px-4 pt-3 pb-3 font-normal">
- <div class="flex items-center gap-3 text-left text-sm">
- <Avatar.Root class="size-8 shrink-0 rounded-lg">
- {#if $settingsStore.enableGravatar}
- {#await getGravatarUrl(user?.email)}
- <Avatar.Image src={getDefaultProfilePicture()} alt={user.displayName} />
- {:then url}
- <Avatar.Image src={url} alt={user.displayName} />
- {:catch}
- <Avatar.Image src={getDefaultProfilePicture()} alt={user.displayName} />
- {/await}
- {:else}
+ <div class="flex items-center gap-2.5 px-2 py-2">
+ <Avatar.Root class="size-8 shrink-0 rounded-lg">
+ {#if $settingsStore.enableGravatar}
+ {#await getGravatarUrl(user?.email)}
<Avatar.Image src={getDefaultProfilePicture()} alt={user.displayName} />
- {/if}
- <Avatar.Fallback
- class="from-primary/20 to-primary/10 text-primary border-primary/20 rounded-lg border bg-linear-to-br"
- >
- {user.displayName?.charAt(0).toUpperCase()}
- </Avatar.Fallback>
- </Avatar.Root>
- <div class="grid min-w-0 flex-1 text-left text-sm leading-tight">
- <span class="truncate font-medium">{user.displayName}</span>
- <span class="truncate text-xs">{user.email}</span>
- </div>
+ {:then url}
+ <Avatar.Image src={url} alt={user.displayName} />
+ {:catch}
+ <Avatar.Image src={getDefaultProfilePicture()} alt={user.displayName} />
+ {/await}
+ {:else}
+ <Avatar.Image src={getDefaultProfilePicture()} alt={user.displayName} />
+ {/if}
+ <Avatar.Fallback
+ class="from-primary/20 to-primary/10 text-primary border-primary/20 rounded-lg border bg-linear-to-br text-xs font-semibold"
+ >
+ {user.displayName?.charAt(0).toUpperCase()}
+ </Avatar.Fallback>
+ </Avatar.Root>
+ <div class="grid min-w-0 flex-1 leading-tight">
+ <span class="truncate text-sm font-medium">{user.displayName}</span>
+ <span class="text-muted-foreground truncate text-xs">{user.email}</span>
</div>
- </DropdownMenu.Label>
- <DropdownMenu.Separator />
+ </div>
+
+ <DropdownMenu.Separator class="my-1" />
- <LocalePicker
- inline={false}
- onOpenChange={(open: boolean) => {
- localePickerOpen = open;
- if (!open && sidebar.state === 'collapsed') {
- sidebar.setHovered(false, 150);
- }
+ <button
+ type="button"
+ class="hover:bg-muted/60 text-foreground flex w-full items-center gap-2.5 rounded-lg px-2 py-2 text-sm transition-colors"
+ onclick={() => {
+ dropdownOpen = false;
+ goto('/account');
}}
- />
+ >
+ <UserIcon class="text-muted-foreground size-4 shrink-0" />
+ <span>Account</span>
+ </button>
- <DropdownMenu.Group class="px-3 pb-2">
- <ArcaneButton
- action="base"
- tone="ghost"
- class={cn(
- 'text-muted-foreground flex w-full items-center rounded-xl text-sm font-medium transition-all duration-200 hover:bg-linear-to-br',
- 'h-11 justify-start gap-3 px-3 py-2.5'
- )}
- title={m.common_toggle_theme()}
- onclick={toggleMode}
- >
- <div class="group-hover:bg-muted-foreground/10 rounded-lg bg-transparent p-1 transition-colors duration-200">
- {#if mode.current === 'dark'}
- <SunIcon class="size-4 transition-transform duration-200" />
- {:else}
- <MoonIcon class="size-4 transition-transform duration-200" />
- {/if}
- </div>
- <span class="font-medium">{m.common_toggle_theme()}</span>
- </ArcaneButton>
- </DropdownMenu.Group>
+ {#if !autoLoginEnabled}
+ <form action="/logout" method="POST" class="w-full">
+ <button
+ type="submit"
+ class="hover:bg-destructive/10 text-destructive flex w-full items-center gap-2.5 rounded-lg px-2 py-2 text-sm transition-colors"
+ >
+ <LogoutIcon class="size-4 shrink-0" />
+ <span>Log out</span>
+ </button>
+ </form>
+ {/if}
</div>
</DropdownMenu.Content>
</DropdownMenu.Root>
diff --git a/frontend/src/lib/components/sidebar/sidebar.svelte b/frontend/src/lib/components/sidebar/sidebar.svelte
index 4cb9c3602..63e6fb94b 100644
--- a/frontend/src/lib/components/sidebar/sidebar.svelte
+++ b/frontend/src/lib/components/sidebar/sidebar.svelte
@@ -24,9 +24,7 @@
import userStore from '$lib/stores/user-store';
import settingsStore from '$lib/stores/config-store';
import { m } from '$lib/paraglide/messages';
- import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import VersionInfoDialog from '$lib/components/dialogs/version-info-dialog.svelte';
- import { LogoutIcon } from '$lib/icons';
import { environmentStore } from '$lib/stores/environment.store.svelte';
import { fromStore } from 'svelte/store';
@@ -129,33 +127,9 @@
<Sidebar.Footer>
<SidebarUpdatebanner {isCollapsed} {versionInformation} debug={false} />
{#if effectiveUser}
- {#if isCollapsed}
- <div class="px-0 pb-2">
- <div class="flex flex-col items-center gap-2">
- <SidebarUser {isCollapsed} user={effectiveUser} />
- </div>
- </div>
- {:else}
- <div class="px-3 pb-2">
- <div class="flex items-center gap-2">
- <SidebarUser {isCollapsed} user={effectiveUser} />
- {#if !autoLoginEnabled}
- <form action="/logout" method="POST" class="ml-auto">
- <ArcaneButton
- action="base"
- tone="ghost"
- title={m.common_logout()}
- type="submit"
- class="text-muted-foreground hover:text-destructive hover:bg-destructive/10 h-9 w-9 rounded-xl p-0"
- icon={LogoutIcon}
- showLabel={false}
- customLabel={m.common_logout()}
- />
- </form>
- {/if}
- </div>
- </div>
- {/if}
+ <div class={isCollapsed ? 'px-0 pb-2' : 'px-3 pb-2'}>
+ <SidebarUser {isCollapsed} user={effectiveUser} {autoLoginEnabled} />
+ </div>
{/if}
<div class={`flex items-center justify-center ${isCollapsed ? 'px-1' : 'px-4'}`}>
<button
diff --git a/frontend/src/lib/services/api-key-service.ts b/frontend/src/lib/services/api-key-service.ts
index 96ac92c53..1ec737ab8 100644
--- a/frontend/src/lib/services/api-key-service.ts
+++ b/frontend/src/lib/services/api-key-service.ts
@@ -25,6 +25,18 @@ export default class ApiKeyAPIService extends BaseAPIService {
async delete(id: string): Promise<void> {
return this.handleResponse(this.api.delete(`/api-keys/${id}`)) as Promise<void>;
}
+
+ async listMine(): Promise<ApiKey[]> {
+ return this.handleResponse(this.api.get('/auth/me/api-keys')) as Promise<ApiKey[]>;
+ }
+
+ async createMine(apiKey: CreateApiKey): Promise<ApiKeyCreated> {
+ return this.handleResponse(this.api.post('/auth/me/api-keys', apiKey)) as Promise<ApiKeyCreated>;
+ }
+
+ async deleteMine(id: string): Promise<void> {
+ return this.handleResponse(this.api.delete(`/auth/me/api-keys/${id}`)) as Promise<void>;
+ }
}
export const apiKeyService = new ApiKeyAPIService();
diff --git a/frontend/src/lib/services/user-service.ts b/frontend/src/lib/services/user-service.ts
index 1e3a8a4b5..9dfea87fb 100644
--- a/frontend/src/lib/services/user-service.ts
+++ b/frontend/src/lib/services/user-service.ts
@@ -33,6 +33,14 @@ export default class UserAPIService extends BaseAPIService {
async changePassword(data: { currentPassword: string; newPassword: string }): Promise<void> {
return this.handleResponse(this.api.post('/auth/password', data)) as Promise<void>;
}
+
+ async logoutAllOtherSessions(): Promise<void> {
+ return this.handleResponse(this.api.post('/auth/sessions/logout-all')) as Promise<void>;
+ }
+
+ async updateMyProfile(data: { displayName?: string; email?: string; locale?: string }): Promise<User> {
+ return this.handleResponse(this.api.put('/auth/me/profile', data)) as Promise<User>;
+ }
}
export const userService = new UserAPIService();
diff --git a/frontend/src/routes/(app)/account/+page.svelte b/frontend/src/routes/(app)/account/+page.svelte
new file mode 100644
index 000000000..c43a94be5
--- /dev/null
+++ b/frontend/src/routes/(app)/account/+page.svelte
@@ -0,0 +1,649 @@
+<script lang="ts">
+ import { onMount } from 'svelte';
+ import { fromStore } from 'svelte/store';
+ import { toast } from 'svelte-sonner';
+ import { mode, toggleMode } from 'mode-watcher';
+ import { format, formatDistanceToNow } from 'date-fns';
+ import HeaderCard from '$lib/components/header-card.svelte';
+ import { Card } from '$lib/components/ui/card';
+ import { Input } from '$lib/components/ui/input';
+ import { Label } from '$lib/components/ui/label';
+ import { Separator } from '$lib/components/ui/separator';
+ import * as Avatar from '$lib/components/ui/avatar';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
+ import LocalePicker from '$lib/components/locale-picker.svelte';
+ import { userService } from '$lib/services/user-service';
+ import { apiKeyService } from '$lib/services/api-key-service';
+ import userStore from '$lib/stores/user-store';
+ import settingsStore from '$lib/stores/config-store';
+ import { getDefaultProfilePicture } from '$lib/utils/docker';
+ import { GLOBAL_SCOPE } from '$lib/types/auth';
+ import type { ApiKey, ApiKeyCreated } from '$lib/types/auth';
+ import { UserIcon, LogoutIcon, ShieldAlertIcon, SunIcon, MoonIcon, ApiKeyIcon, AddIcon, CopyIcon, TrashIcon } from '$lib/icons';
+
+ let { data: _data }: PageProps = $props();
+
+ const BUILT_IN_ROLE_LABELS: Record<string, string> = {
+ role_admin: 'Administrator',
+ role_editor: 'Editor',
+ role_deployer: 'Deployer',
+ role_viewer: 'Viewer'
+ };
+
+ function prettyRoleName(roleId: string): string {
+ return BUILT_IN_ROLE_LABELS[roleId] ?? roleId.replace(/^role_/, '').replace(/_/g, ' ');
+ }
+
+ function safeFormatDate(input: string | undefined, fmt: string): string | null {
+ if (!input) return null;
+ try {
+ return format(new Date(input), fmt);
+ } catch {
+ return null;
+ }
+ }
+
+ function safeFormatRelative(input: string | undefined): string | null {
+ if (!input) return null;
+ try {
+ return formatDistanceToNow(new Date(input), { addSuffix: true });
+ } catch {
+ return null;
+ }
+ }
+
+ const currentUser = $derived($userStore);
+ const isOidcUser = $derived(Boolean(currentUser?.oidcSubjectId));
+
+ const settings = fromStore(settingsStore);
+ const autoLogin = fromStore(settingsStore.autoLoginEnabled);
+ const autoLoginEnabled = $derived(autoLogin.current);
+ const gravatarEnabled = $derived(Boolean(settings.current?.enableGravatar));
+
+ let profileDisplayName = $state('');
+ let profileEmail = $state('');
+ let profileSaving = $state(false);
+ let profileLoaded = $state(false);
+
+ let currentPassword = $state('');
+ let newPassword = $state('');
+ let confirmPassword = $state('');
+ let passwordSaving = $state(false);
+
+ let revokingAll = $state(false);
+ let avatarUrl = $state<string>(getDefaultProfilePicture());
+
+ let apiKeys = $state<ApiKey[]>([]);
+ let apiKeysLoading = $state(false);
+ let showCreateKeyForm = $state(false);
+ let newKeyName = $state('');
+ let newKeyDescription = $state('');
+ let creatingKey = $state(false);
+ let createdKey = $state<ApiKeyCreated | null>(null);
+
+ $effect(() => {
+ if (!profileLoaded && currentUser) {
+ profileDisplayName = currentUser.displayName ?? '';
+ profileEmail = currentUser.email ?? '';
+ profileLoaded = true;
+ }
+ });
+
+ $effect(() => {
+ void updateAvatar(currentUser?.email, gravatarEnabled);
+ });
+
+ const profileDirty = $derived(
+ profileDisplayName.trim() !== (currentUser?.displayName ?? '') || profileEmail.trim() !== (currentUser?.email ?? '')
+ );
+
+ const passwordValid = $derived(currentPassword.length > 0 && newPassword.length >= 8 && newPassword === confirmPassword);
+
+ async function updateAvatar(email: string | undefined, enabled: boolean) {
+ if (!enabled || !email) {
+ avatarUrl = getDefaultProfilePicture();
+ return;
+ }
+ try {
+ const encoder = new TextEncoder();
+ const data = encoder.encode(email.toLowerCase().trim());
+ const hashBuffer = await crypto.subtle.digest('SHA-256', data);
+ const hash = Array.from(new Uint8Array(hashBuffer))
+ .map((b) => b.toString(16).padStart(2, '0'))
+ .join('');
+ avatarUrl = `https://www.gravatar.com/avatar/${hash}?s=128`;
+ } catch {
+ avatarUrl = getDefaultProfilePicture();
+ }
+ }
+
+ async function saveProfile() {
+ if (!currentUser || !profileDirty || profileSaving) return;
+ profileSaving = true;
+ try {
+ const updated = await userService.updateMyProfile({
+ displayName: profileDisplayName.trim(),
+ email: profileEmail.trim()
+ });
+ await userStore.setUser(updated);
+ toast.success('Profile updated');
+ } catch (err) {
+ const msg = err instanceof Error ? err.message : 'Failed to update profile';
+ toast.error(msg);
+ } finally {
+ profileSaving = false;
+ }
+ }
+
+ function resetProfile() {
+ profileDisplayName = currentUser?.displayName ?? '';
+ profileEmail = currentUser?.email ?? '';
+ }
+
+ async function changePassword() {
+ if (!passwordValid || passwordSaving) return;
+ passwordSaving = true;
+ try {
+ await userService.changePassword({ currentPassword, newPassword });
+ toast.success('Password updated');
+ currentPassword = '';
+ newPassword = '';
+ confirmPassword = '';
+ } catch (err) {
+ const msg = err instanceof Error ? err.message : 'Failed to update password';
+ toast.error(msg);
+ } finally {
+ passwordSaving = false;
+ }
+ }
+
+ async function loadApiKeys() {
+ apiKeysLoading = true;
+ try {
+ apiKeys = await apiKeyService.listMine();
+ } catch (err) {
+ toast.error(err instanceof Error ? err.message : 'Failed to load API keys');
+ } finally {
+ apiKeysLoading = false;
+ }
+ }
+
+ async function createApiKey() {
+ if (!newKeyName.trim() || creatingKey) return;
+ creatingKey = true;
+ try {
+ const created = await apiKeyService.createMine({
+ name: newKeyName.trim(),
+ description: newKeyDescription.trim() || undefined,
+ permissions: []
+ });
+ createdKey = created;
+ newKeyName = '';
+ newKeyDescription = '';
+ showCreateKeyForm = false;
+ await loadApiKeys();
+ } catch (err) {
+ toast.error(err instanceof Error ? err.message : 'Failed to create API key');
+ } finally {
+ creatingKey = false;
+ }
+ }
+
+ async function deleteApiKey(id: string, name: string) {
+ if (!confirm(`Delete API key "${name}"? This cannot be undone.`)) return;
+ try {
+ await apiKeyService.deleteMine(id);
+ toast.success('API key deleted');
+ await loadApiKeys();
+ } catch (err) {
+ toast.error(err instanceof Error ? err.message : 'Failed to delete API key');
+ }
+ }
+
+ function copyKeyToClipboard(key: string) {
+ void navigator.clipboard.writeText(key);
+ toast.success('Key copied to clipboard');
+ }
+
+ onMount(() => {
+ void loadApiKeys();
+ });
+
+ async function logoutAllOther() {
+ if (revokingAll) return;
+ revokingAll = true;
+ try {
+ await userService.logoutAllOtherSessions();
+ toast.success('All other sessions signed out');
+ } catch (err) {
+ const msg = err instanceof Error ? err.message : 'Failed to sign out other sessions';
+ toast.error(msg);
+ } finally {
+ revokingAll = false;
+ }
+ }
+</script>
+
+<div class="space-y-6 pb-5 md:space-y-8 md:pb-5">
+ <HeaderCard>
+ <div class="flex items-center justify-between gap-4">
+ <div class="flex min-w-0 flex-1 items-center gap-3 sm:gap-4">
+ <div
+ class="bg-primary/10 text-primary ring-primary/20 flex size-8 shrink-0 items-center justify-center rounded-lg ring-1 sm:size-10"
+ >
+ <UserIcon class="size-4 sm:size-5" />
+ </div>
+ <div class="min-w-0">
+ <h1 class="text-2xl font-semibold tracking-tight sm:text-3xl">Account</h1>
+ <p class="text-muted-foreground mt-1 text-sm">Manage your profile, password, and active sessions</p>
+ </div>
+ </div>
+ </div>
+ </HeaderCard>
+
+ {#if currentUser}
+ <div class="grid gap-6 lg:grid-cols-3">
+ <!-- Left column: profile + password + preferences -->
+ <div class="space-y-6 lg:col-span-2">
+ <!-- Profile -->
+ <Card class="overflow-hidden">
+ <div class="border-b p-4 sm:p-6">
+ <h2 class="text-base font-semibold tracking-tight sm:text-lg">Profile</h2>
+ <p class="text-muted-foreground mt-1 text-xs sm:text-sm">Update your display name and email</p>
+ </div>
+ <div class="space-y-5 p-4 sm:p-6">
+ <div class="flex items-center gap-4">
+ <Avatar.Root class="size-16 rounded-xl">
+ <Avatar.Image src={avatarUrl} alt={currentUser.displayName ?? currentUser.username} />
+ <Avatar.Fallback
+ class="from-primary/20 to-primary/10 text-primary border-primary/20 rounded-xl border bg-linear-to-br text-xl font-semibold"
+ >
+ {(currentUser.displayName ?? currentUser.username).charAt(0).toUpperCase()}
+ </Avatar.Fallback>
+ </Avatar.Root>
+ <div class="min-w-0">
+ <div class="text-sm font-medium">@{currentUser.username}</div>
+ <div class="text-muted-foreground text-xs">
+ {isOidcUser ? 'Single sign-on account' : 'Local account'}
+ </div>
+ </div>
+ </div>
+
+ <div class="grid gap-4 sm:grid-cols-2">
+ <div class="space-y-2">
+ <Label for="account-display-name">Display Name</Label>
+ <Input id="account-display-name" bind:value={profileDisplayName} placeholder="Your name" disabled={isOidcUser} />
+ </div>
+ <div class="space-y-2">
+ <Label for="account-email">Email</Label>
+ <Input
+ id="account-email"
+ type="email"
+ bind:value={profileEmail}
+ placeholder="[email protected]"
+ disabled={isOidcUser}
+ />
+ </div>
+ </div>
+
+ {#if isOidcUser}
+ <p class="text-muted-foreground text-xs">Profile fields are managed by your identity provider.</p>
+ {:else}
+ <div class="flex flex-col-reverse items-stretch justify-end gap-2 sm:flex-row sm:items-center">
+ <ArcaneButton
+ action="cancel"
+ tone="ghost"
+ customLabel="Reset"
+ onclick={resetProfile}
+ disabled={!profileDirty || profileSaving}
+ />
+ <ArcaneButton
+ action="save"
+ customLabel="Save changes"
+ onclick={saveProfile}
+ loading={profileSaving}
+ disabled={!profileDirty || profileSaving}
+ />
+ </div>
+ {/if}
+ </div>
+ </Card>
+
+ <!-- Password -->
+ {#if !isOidcUser && !autoLoginEnabled}
+ <Card class="overflow-hidden">
+ <div class="border-b p-4 sm:p-6">
+ <h2 class="text-base font-semibold tracking-tight sm:text-lg">Password</h2>
+ <p class="text-muted-foreground mt-1 text-xs sm:text-sm">Changing your password signs out every other session</p>
+ </div>
+ <div class="space-y-4 p-4 sm:p-6">
+ <div class="space-y-2">
+ <Label for="account-current-password">Current password</Label>
+ <Input
+ id="account-current-password"
+ type="password"
+ bind:value={currentPassword}
+ autocomplete="current-password"
+ />
+ </div>
+ <div class="grid gap-4 sm:grid-cols-2">
+ <div class="space-y-2">
+ <Label for="account-new-password">New password</Label>
+ <Input id="account-new-password" type="password" bind:value={newPassword} autocomplete="new-password" />
+ <p class="text-muted-foreground text-xs">At least 8 characters</p>
+ </div>
+ <div class="space-y-2">
+ <Label for="account-confirm-password">Confirm new password</Label>
+ <Input id="account-confirm-password" type="password" bind:value={confirmPassword} autocomplete="new-password" />
+ {#if confirmPassword.length > 0 && confirmPassword !== newPassword}
+ <p class="text-destructive text-xs">Passwords don't match</p>
+ {/if}
+ </div>
+ </div>
+ <div class="flex justify-end">
+ <ArcaneButton
+ action="save"
+ customLabel="Update password"
+ onclick={changePassword}
+ loading={passwordSaving}
+ disabled={!passwordValid || passwordSaving}
+ />
+ </div>
+ </div>
+ </Card>
+ {/if}
+
+ <!-- Preferences -->
+ <Card class="overflow-hidden">
+ <div class="border-b p-4 sm:p-6">
+ <h2 class="text-base font-semibold tracking-tight sm:text-lg">Preferences</h2>
+ <p class="text-muted-foreground mt-1 text-xs sm:text-sm">Personal display preferences</p>
+ </div>
+ <div class="divide-y p-2">
+ <div class="flex items-center justify-between gap-4 p-3">
+ <div class="min-w-0">
+ <div class="text-sm font-medium">Theme</div>
+ <div class="text-muted-foreground text-xs">Switch between light and dark mode</div>
+ </div>
+ <button
+ type="button"
+ onclick={toggleMode}
+ class="border-border hover:bg-muted/60 flex items-center gap-2 rounded-lg border px-3 py-1.5 text-sm font-medium transition-colors"
+ >
+ {#if mode.current === 'dark'}
+ <MoonIcon class="size-4" />
+ Dark
+ {:else}
+ <SunIcon class="size-4" />
+ Light
+ {/if}
+ </button>
+ </div>
+ <div class="flex items-center justify-between gap-4 p-3">
+ <div class="min-w-0">
+ <div class="text-sm font-medium">Language</div>
+ <div class="text-muted-foreground text-xs">UI language for this account</div>
+ </div>
+ <LocalePicker inline />
+ </div>
+ </div>
+ </Card>
+
+ <!-- API keys -->
+ <Card class="overflow-hidden">
+ <div class="flex items-start justify-between gap-3 border-b p-4 sm:p-6">
+ <div class="min-w-0">
+ <h2 class="text-base font-semibold tracking-tight sm:text-lg">API keys</h2>
+ <p class="text-muted-foreground mt-1 text-xs sm:text-sm">Personal tokens for programmatic access</p>
+ </div>
+ {#if !showCreateKeyForm && !createdKey}
+ <ArcaneButton
+ action="create"
+ tone="outline"
+ size="sm"
+ customLabel="New key"
+ icon={AddIcon}
+ onclick={() => (showCreateKeyForm = true)}
+ />
+ {/if}
+ </div>
+
+ <div class="p-4 sm:p-6">
+ {#if createdKey}
+ <div class="border-primary/30 bg-primary/5 mb-4 space-y-3 rounded-lg border p-4">
+ <div>
+ <div class="text-sm font-semibold">Key created: {createdKey.name}</div>
+ <p class="text-muted-foreground mt-1 text-xs">Copy this token now &mdash; you won't be able to see it again.</p>
+ </div>
+ <div class="flex items-center gap-2">
+ <code class="bg-background flex-1 truncate rounded border px-3 py-2 font-mono text-xs">
+ {createdKey.key}
+ </code>
+ <ArcaneButton
+ action="base"
+ tone="outline"
+ size="sm"
+ customLabel="Copy"
+ icon={CopyIcon}
+ onclick={() => copyKeyToClipboard(createdKey!.key)}
+ />
+ </div>
+ <div class="flex justify-end">
+ <ArcaneButton
+ action="cancel"
+ tone="ghost"
+ size="sm"
+ customLabel="I've saved it"
+ onclick={() => (createdKey = null)}
+ />
+ </div>
+ </div>
+ {/if}
+
+ {#if showCreateKeyForm}
+ <div class="mb-4 space-y-3 rounded-lg border p-4">
+ <div class="space-y-2">
+ <Label for="api-key-name">Key name</Label>
+ <Input id="api-key-name" bind:value={newKeyName} placeholder="e.g. CI deploy bot" />
+ </div>
+ <div class="space-y-2">
+ <Label for="api-key-description">Description (optional)</Label>
+ <Input id="api-key-description" bind:value={newKeyDescription} placeholder="What is this key for?" />
+ </div>
+ <p class="text-muted-foreground text-xs">
+ Keys are created without explicit permission scopes. An admin can add scopes later from Settings &rarr; API Keys
+ if needed.
+ </p>
+ <div class="flex justify-end gap-2">
+ <ArcaneButton
+ action="cancel"
+ tone="ghost"
+ customLabel="Cancel"
+ onclick={() => {
+ showCreateKeyForm = false;
+ newKeyName = '';
+ newKeyDescription = '';
+ }}
+ disabled={creatingKey}
+ />
+ <ArcaneButton
+ action="create"
+ customLabel="Create key"
+ onclick={createApiKey}
+ loading={creatingKey}
+ disabled={!newKeyName.trim() || creatingKey}
+ />
+ </div>
+ </div>
+ {/if}
+
+ {#if apiKeysLoading && apiKeys.length === 0}
+ <div class="text-muted-foreground py-8 text-center text-sm">Loading keys…</div>
+ {:else if apiKeys.length === 0}
+ <div class="text-muted-foreground py-8 text-center text-sm">
+ <ApiKeyIcon class="mx-auto mb-2 size-8 opacity-40" />
+ No API keys yet.
+ </div>
+ {:else}
+ <ul class="divide-y">
+ {#each apiKeys as key (key.id)}
+ <li class="flex items-center justify-between gap-3 py-3 first:pt-0 last:pb-0">
+ <div class="min-w-0 flex-1">
+ <div class="flex items-center gap-2">
+ <span class="truncate text-sm font-medium">{key.name}</span>
+ <code class="text-muted-foreground bg-muted/40 rounded px-1.5 py-0.5 font-mono text-xs">
+ {key.keyPrefix}…
+ </code>
+ </div>
+ {#if key.description}
+ <div class="text-muted-foreground mt-0.5 truncate text-xs">{key.description}</div>
+ {/if}
+ <div class="text-muted-foreground mt-1 text-xs">
+ {#if safeFormatDate(key.createdAt, 'PP')}
+ Created {safeFormatDate(key.createdAt, 'PP')}
+ {/if}
+ {#if key.lastUsedAt && safeFormatRelative(key.lastUsedAt)}
+ · Last used {safeFormatRelative(key.lastUsedAt)}
+ {:else}
+ · Never used
+ {/if}
+ </div>
+ </div>
+ <ArcaneButton
+ action="remove"
+ tone="ghost"
+ size="sm"
+ icon={TrashIcon}
+ customLabel="Delete"
+ showLabel={false}
+ class="text-muted-foreground hover:text-destructive hover:bg-destructive/10"
+ onclick={() => deleteApiKey(key.id, key.name)}
+ />
+ </li>
+ {/each}
+ </ul>
+ {/if}
+ </div>
+ </Card>
+ </div>
+
+ <!-- Right column: account info + roles + danger zone -->
+ <div class="space-y-6">
+ <!-- Account info -->
+ <Card class="overflow-hidden">
+ <div class="border-b p-4 sm:p-6">
+ <h2 class="text-base font-semibold tracking-tight sm:text-lg">Account info</h2>
+ </div>
+ <dl class="divide-y p-2 text-sm">
+ <div class="flex items-center justify-between gap-4 p-3">
+ <dt class="text-muted-foreground">Username</dt>
+ <dd class="font-medium tabular-nums">@{currentUser.username}</dd>
+ </div>
+ <div class="flex items-center justify-between gap-4 p-3">
+ <dt class="text-muted-foreground">Account type</dt>
+ <dd class="font-medium">{isOidcUser ? 'Single sign-on' : 'Local'}</dd>
+ </div>
+ {#if safeFormatDate(currentUser.createdAt, 'PP')}
+ <div class="flex items-center justify-between gap-4 p-3">
+ <dt class="text-muted-foreground">Member since</dt>
+ <dd class="font-medium">{safeFormatDate(currentUser.createdAt, 'PP')}</dd>
+ </div>
+ {/if}
+ <div class="flex items-center justify-between gap-4 p-3">
+ <dt class="text-muted-foreground">Last login</dt>
+ <dd class="text-right font-medium" title={currentUser.lastLogin ?? ''}>
+ {safeFormatRelative(currentUser.lastLogin) ?? 'Never'}
+ </dd>
+ </div>
+ </dl>
+ </Card>
+
+ <!-- Roles & access -->
+ <Card class="overflow-hidden">
+ <div class="border-b p-4 sm:p-6">
+ <h2 class="text-base font-semibold tracking-tight sm:text-lg">Roles &amp; access</h2>
+ <p class="text-muted-foreground mt-1 text-xs sm:text-sm">Your assigned roles</p>
+ </div>
+ <div class="p-4 sm:p-6">
+ {#if currentUser.roleAssignments && currentUser.roleAssignments.length > 0}
+ <ul class="space-y-2">
+ {#each currentUser.roleAssignments as ra (`${ra.roleId}-${ra.environmentId ?? 'global'}`)}
+ <li class="bg-muted/30 flex items-center justify-between gap-3 rounded-lg px-3 py-2">
+ <div class="min-w-0">
+ <div class="text-sm font-medium">{prettyRoleName(ra.roleId)}</div>
+ <div class="text-muted-foreground text-xs">
+ {ra.environmentId ? `Environment: ${ra.environmentId}` : 'Global scope'}
+ {#if ra.source === 'oidc'}
+ <span class="ml-1 opacity-70">· via SSO</span>
+ {/if}
+ </div>
+ </div>
+ </li>
+ {/each}
+ </ul>
+ {:else}
+ <p class="text-muted-foreground text-sm">No roles assigned.</p>
+ {/if}
+
+ {#if currentUser.permissionsByEnv}
+ {@const envCount = Object.keys(currentUser.permissionsByEnv).length}
+ {@const globalCount = currentUser.permissionsByEnv[GLOBAL_SCOPE]?.length ?? 0}
+ <p class="text-muted-foreground mt-3 text-xs">
+ {globalCount} global permission{globalCount === 1 ? '' : 's'} across {envCount} environment{envCount === 1
+ ? ''
+ : 's'}.
+ </p>
+ {/if}
+ </div>
+ </Card>
+
+ {#if !autoLoginEnabled}
+ <Card class="border-destructive/30 overflow-hidden">
+ <div class="border-destructive/20 border-b p-4 sm:p-6">
+ <div class="flex items-center gap-2">
+ <ShieldAlertIcon class="text-destructive size-5" />
+ <h2 class="text-base font-semibold tracking-tight sm:text-lg">Danger zone</h2>
+ </div>
+ <p class="text-muted-foreground mt-1 text-xs sm:text-sm">Session-level actions that affect every device</p>
+ </div>
+ <div class="space-y-4 p-4 sm:p-6">
+ <div class="space-y-2">
+ <div class="text-sm font-medium">Sign out other sessions</div>
+ <p class="text-muted-foreground text-xs">
+ Revokes every active session except this one. Useful if you forgot to log out somewhere.
+ </p>
+ <ArcaneButton
+ action="restart"
+ tone="outline"
+ customLabel="Sign out other sessions"
+ onclick={logoutAllOther}
+ loading={revokingAll}
+ disabled={revokingAll}
+ />
+ </div>
+
+ <Separator />
+
+ <div class="space-y-2">
+ <div class="text-sm font-medium">Log out</div>
+ <p class="text-muted-foreground text-xs">Sign out of this device.</p>
+ <form action="/logout" method="POST">
+ <ArcaneButton
+ action="cancel"
+ tone="outline"
+ customLabel="Log out"
+ icon={LogoutIcon}
+ type="submit"
+ class="text-destructive border-destructive/30 hover:bg-destructive/10 hover:text-destructive"
+ />
+ </form>
+ </div>
+ </div>
+ </Card>
+ {/if}
+ </div>
+ </div>
+ {:else}
+ <div class="text-muted-foreground py-12 text-center text-sm">Loading account…</div>
+ {/if}
+</div>
diff --git a/frontend/src/routes/(app)/containers/components/container-stats-cell.svelte b/frontend/src/routes/(app)/containers/components/container-stats-cell.svelte
index da38d7f5c..a57c17641 100644
--- a/frontend/src/routes/(app)/containers/components/container-stats-cell.svelte
+++ b/frontend/src/routes/(app)/containers/components/container-stats-cell.svelte
@@ -1,5 +1,11 @@
+<script module lang="ts">
+ let uidCounter = 0;
+ function nextUid() {
+ return ++uidCounter;
+ }
+</script>
+
<script lang="ts">
- import { Progress } from '$lib/components/ui/progress/index.js';
import { m } from '$lib/paraglide/messages';
import { bytes } from '$lib/utils/formatting';
@@ -22,28 +28,77 @@
if (type !== 'memory' || value === undefined) return undefined;
return bytes.format(value, { unitSeparator: ' ' });
});
+
+ const percent = $derived(type === 'cpu' ? value : memoryPercent);
+ const clampedPercent = $derived(percent === undefined ? 0 : Math.max(0, Math.min(100, percent)));
+
+ const size = 26;
+ const stroke = 3.5;
+ const radius = (size - stroke) / 2;
+ const circumference = 2 * Math.PI * radius;
+ const dashOffset = $derived(circumference * (1 - clampedPercent / 100));
+
+ const uid = nextUid();
+ const gradientId = $derived(`arcane-ring-${type}-${uid}`);
</script>
+{#snippet ring()}
+ <svg width={size} height={size} viewBox="0 0 {size} {size}" class="shrink-0 -rotate-90" aria-hidden="true">
+ <defs>
+ {#if type === 'cpu'}
+ <linearGradient id={gradientId} x1="0%" y1="0%" x2="100%" y2="100%">
+ <stop offset="0%" stop-color="oklch(0.75 0.18 35)" />
+ <stop offset="100%" stop-color="oklch(0.65 0.24 25)" />
+ </linearGradient>
+ {:else}
+ <linearGradient id={gradientId} x1="0%" y1="0%" x2="100%" y2="100%">
+ <stop offset="0%" stop-color="oklch(0.72 0.18 300)" />
+ <stop offset="100%" stop-color="oklch(0.58 0.25 290)" />
+ </linearGradient>
+ {/if}
+ </defs>
+ <circle
+ cx={size / 2}
+ cy={size / 2}
+ r={radius}
+ fill="none"
+ stroke="currentColor"
+ stroke-width={stroke}
+ class="text-muted/40"
+ />
+ <circle
+ cx={size / 2}
+ cy={size / 2}
+ r={radius}
+ fill="none"
+ stroke="url(#{gradientId})"
+ stroke-width={stroke}
+ stroke-linecap="round"
+ stroke-dasharray={circumference}
+ stroke-dashoffset={dashOffset}
+ style="transition: stroke-dashoffset 300ms ease-out;"
+ />
+ </svg>
+{/snippet}
+
{#if stopped}
<div class="text-muted-foreground text-xs">{m.common_na()}</div>
{:else if loading}
<div class="flex items-center gap-2">
- <div class="bg-muted h-1.5 flex-1 animate-pulse rounded-full"></div>
+ <div class="bg-muted size-[26px] shrink-0 animate-pulse rounded-full"></div>
<div class="bg-muted h-3 w-16 animate-pulse rounded"></div>
</div>
{:else if type === 'memory' && memoryFormatted}
<div class="flex items-center gap-2">
- {#if memoryPercent !== undefined}
- <Progress value={memoryPercent} max={100} class="h-1.5 flex-1" />
- {/if}
- <span class="text-foreground min-w-16 text-right text-xs font-medium tabular-nums">
+ {@render ring()}
+ <span class="text-foreground text-xs font-medium tabular-nums">
{memoryFormatted}
</span>
</div>
{:else if type === 'cpu' && value !== undefined}
<div class="flex items-center gap-2">
- <Progress {value} max={100} class="h-1.5 flex-1" />
- <span class="text-foreground min-w-10 text-right text-xs font-medium tabular-nums">
+ {@render ring()}
+ <span class="text-foreground text-xs font-medium tabular-nums">
{value.toFixed(1)}%
</span>
</div>
diff --git a/frontend/src/routes/(app)/dashboard/dashboard-all-environments-view.svelte b/frontend/src/routes/(app)/dashboard/dashboard-all-environments-view.svelte
index 73a275be4..b4af2dfec 100644
--- a/frontend/src/routes/(app)/dashboard/dashboard-all-environments-view.svelte
+++ b/frontend/src/routes/(app)/dashboard/dashboard-all-environments-view.svelte
@@ -634,14 +634,14 @@
}
</script>
-<div class="flex h-full min-h-0 flex-col gap-4 overflow-hidden pt-3 md:gap-5 md:pt-4">
+<div class="flex h-full min-h-0 flex-col gap-3 overflow-hidden pt-2 md:gap-4 md:pt-3">
<header
- class="dark:border-surface/80 dark:bg-surface/10 shrink-0 rounded-xl border border-white/80 bg-white/10 p-4 shadow-sm backdrop-blur-sm sm:p-5"
+ class="dark:border-surface/80 dark:bg-surface/10 shrink-0 rounded-xl border border-white/80 bg-white/10 p-3 shadow-sm backdrop-blur-sm sm:p-4"
>
- <div class="relative flex flex-col gap-4 lg:flex-row lg:items-start lg:justify-between">
- <div class="space-y-1.5">
+ <div class="relative flex flex-col gap-3 lg:flex-row lg:items-start lg:justify-between">
+ <div class="space-y-1">
<p class="text-muted-foreground text-[11px] font-semibold tracking-[0.14em] uppercase">{m.dashboard_title()}</p>
- <h1 class="text-2xl font-semibold tracking-tight sm:text-3xl">{heroGreeting}</h1>
+ <h1 class="text-xl font-semibold tracking-tight sm:text-2xl">{heroGreeting}</h1>
</div>
<ArcaneButton
@@ -655,64 +655,64 @@
</div>
</header>
- <section class="shrink-0 space-y-3">
- <h2 class="text-lg font-semibold tracking-tight">{m.common_overview()}</h2>
+ <section class="shrink-0 space-y-2">
+ <h2 class="text-base font-semibold tracking-tight">{m.common_overview()}</h2>
{#await environmentBoardStatePromise}
- <div class="grid grid-cols-1 gap-3 md:grid-cols-2 xl:grid-cols-4">
+ <div class="grid grid-cols-1 gap-2 md:grid-cols-2 xl:grid-cols-4">
{#each [1, 2, 3, 4] as tile (tile)}
- <div class="border-border/50 bg-background/50 rounded-xl border p-4">
+ <div class="border-border/50 bg-background/50 rounded-xl border p-3">
<Skeleton class="h-3 w-24" />
- <Skeleton class="mt-3 h-9 w-16" />
- <Skeleton class="mt-2 h-4 w-32" />
+ <Skeleton class="mt-2 h-7 w-16" />
+ <Skeleton class="mt-1.5 h-3.5 w-32" />
</div>
{/each}
</div>
{:then boardState}
{@const summary = boardState.summary}
- <div class="grid grid-cols-1 gap-3 md:grid-cols-2 xl:grid-cols-4">
- <div class="border-border/50 bg-background/50 rounded-xl border p-4">
+ <div class="grid grid-cols-1 gap-2 md:grid-cols-2 xl:grid-cols-4">
+ <div class="border-border/50 bg-background/50 rounded-xl border p-3">
<div class="text-muted-foreground flex items-center gap-1.5 text-[11px] font-semibold tracking-wide uppercase">
<EnvironmentsIcon class="size-3.5" />
<span>{m.environments_title()}</span>
</div>
- <div class="mt-3 text-3xl font-semibold tracking-tight tabular-nums">{summary.totalEnvironments}</div>
- <div class="text-muted-foreground mt-1 text-sm">{formatEnvironmentOverviewLabel(summary)}</div>
+ <div class="mt-2 text-2xl font-semibold tracking-tight tabular-nums">{summary.totalEnvironments}</div>
+ <div class="text-muted-foreground mt-0.5 text-xs">{formatEnvironmentOverviewLabel(summary)}</div>
</div>
- <div class="border-border/50 bg-background/50 rounded-xl border p-4">
+ <div class="border-border/50 bg-background/50 rounded-xl border p-3">
<div class="text-muted-foreground flex items-center gap-1.5 text-[11px] font-semibold tracking-wide uppercase">
<ContainersIcon class="size-3.5" />
<span>{m.containers_title()}</span>
</div>
- <div class="mt-3 text-3xl font-semibold tracking-tight tabular-nums">{summary.totalContainers}</div>
- <div class="text-muted-foreground mt-1 text-sm">{formatContainerOverviewLabel(summary)}</div>
+ <div class="mt-2 text-2xl font-semibold tracking-tight tabular-nums">{summary.totalContainers}</div>
+ <div class="text-muted-foreground mt-0.5 text-xs">{formatContainerOverviewLabel(summary)}</div>
</div>
- <div class="border-border/50 bg-background/50 rounded-xl border p-4">
+ <div class="border-border/50 bg-background/50 rounded-xl border p-3">
<div class="text-muted-foreground flex items-center gap-1.5 text-[11px] font-semibold tracking-wide uppercase">
<ImagesIcon class="size-3.5" />
<span>{m.images_title()}</span>
</div>
- <div class="mt-3 text-3xl font-semibold tracking-tight tabular-nums">{summary.totalImages}</div>
- <div class="text-muted-foreground mt-1 text-sm">{formatImageOverviewLabel(summary)}</div>
+ <div class="mt-2 text-2xl font-semibold tracking-tight tabular-nums">{summary.totalImages}</div>
+ <div class="text-muted-foreground mt-0.5 text-xs">{formatImageOverviewLabel(summary)}</div>
</div>
- <div class="border-border/50 bg-background/50 rounded-xl border p-4">
+ <div class="border-border/50 bg-background/50 rounded-xl border p-3">
<div class="text-muted-foreground flex items-center gap-1.5 text-[11px] font-semibold tracking-wide uppercase">
<VolumesIcon class="size-3.5" />
<span>{m.dashboard_all_storage_title()}</span>
</div>
- <div class="mt-3 text-3xl font-semibold tracking-tight tabular-nums">{bytes.format(summary.totalImageSize)}</div>
- <div class="text-muted-foreground mt-1 text-sm">{formatStorageOverviewLabel(summary)}</div>
+ <div class="mt-2 text-2xl font-semibold tracking-tight tabular-nums">{bytes.format(summary.totalImageSize)}</div>
+ <div class="text-muted-foreground mt-0.5 text-xs">{formatStorageOverviewLabel(summary)}</div>
</div>
</div>
{/await}
</section>
<section class="flex min-h-0 flex-1 flex-col overflow-hidden">
- <div class="mb-3 flex items-center justify-between gap-3">
- <h2 class="text-lg font-semibold tracking-tight">{m.dashboard_all_environment_board_title()}</h2>
+ <div class="mb-2 flex items-center justify-between gap-3">
+ <h2 class="text-base font-semibold tracking-tight">{m.dashboard_all_environment_board_title()}</h2>
</div>
{#if environmentCards.length === 0}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 77468c5fd..7cd959a4b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -94,6 +94,12 @@ importers:
'@codemirror/view':
specifier: ^6.43.0
version: 6.43.0
+ '@fontsource-variable/geist-mono':
+ specifier: ^5.2.8
+ version: 5.2.8
+ '@fontsource-variable/montserrat':
+ specifier: ^5.2.8
+ version: 5.2.8
'@lezer/highlight':
specifier: ^1.2.3
version: 1.2.3
@@ -597,6 +603,12 @@ packages:
'@floating-ui/[email protected]':
resolution: {integrity: sha512-RiB/yIh78pcIxl6lLMG0CgBXAZ2Y0eVHqMPYugu+9U0AeT6YBeiJpf7lbdJNIugFP5SIjwNRgo4DhR1Qxi26Gg==}
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-KI5bj+hkkRiHttYHmccotUZ80ZuZyai+RwI1d7UId0clkx/jXxlo8qYK8j54WzmpBjtMoEMPyllV7faDcj+6RA==}
+
+ '@fontsource-variable/[email protected]':
+ resolution: {integrity: sha512-d8wykq7GCKhEOlLwEuQIOK3w3qsXNxwDlH0meru4AZZzQ4/+rZyvHWKL6BBtHdmbovSHEEQDkwkD8qYUKlcFtQ==}
+
resolution: {integrity: sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==}
@@ -3373,6 +3385,10 @@ snapshots:
'@floating-ui/[email protected]': {}
+ '@fontsource-variable/[email protected]': {}
+
+ '@fontsource-variable/[email protected]': {}
+
optional: true