Verschiebe benutzerbezogene Einstellungen ins Benutzerprofil.
Theme, Farbschema, OWM-Schlüssel, Push, PWA und App-Tour liegen nun im Profil mit pro-User-localStorage. Der Logbuch-Tab fokussiert Teilen, Backup und Crew. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -1,3 +1,5 @@
|
||||
import { getColorSchemePreference as getStoredColorScheme, getThemePreference } from './userPreferences.js'
|
||||
|
||||
export type ColorSchemePreference = 'auto' | 'light' | 'dark'
|
||||
export type ResolvedColorScheme = 'light' | 'dark'
|
||||
export type AppTheme = 'ocean' | 'material' | 'cupertino'
|
||||
@@ -6,7 +8,7 @@ const THEME_CLASSES = ['theme-ocean', 'theme-material', 'theme-cupertino'] as co
|
||||
const SCHEME_CLASSES = ['scheme-light', 'scheme-dark'] as const
|
||||
|
||||
export function getColorSchemePreference(): ColorSchemePreference {
|
||||
const stored = localStorage.getItem('active_color_scheme')
|
||||
const stored = getStoredColorScheme()
|
||||
if (stored === 'light' || stored === 'dark' || stored === 'auto') return stored
|
||||
return 'auto'
|
||||
}
|
||||
@@ -19,7 +21,7 @@ export function resolveColorScheme(pref?: ColorSchemePreference): ResolvedColorS
|
||||
}
|
||||
|
||||
export function resolveAppTheme(): AppTheme {
|
||||
const configTheme = localStorage.getItem('active_theme') || 'auto'
|
||||
const configTheme = getThemePreference() || 'auto'
|
||||
if (configTheme === 'material' || configTheme === 'cupertino' || configTheme === 'ocean') {
|
||||
return configTheme
|
||||
}
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
import { beforeEach, describe, expect, it } from 'vitest'
|
||||
import {
|
||||
getColorSchemePreference,
|
||||
getOwmApiKey,
|
||||
getThemePreference,
|
||||
setColorSchemePreference,
|
||||
setOwmApiKey,
|
||||
setThemePreference
|
||||
} from './userPreferences.js'
|
||||
|
||||
const USER_ID = 'test-user-123'
|
||||
|
||||
describe('userPreferences', () => {
|
||||
beforeEach(() => {
|
||||
localStorage.clear()
|
||||
})
|
||||
|
||||
it('migrates legacy theme and color scheme keys on first read', () => {
|
||||
localStorage.setItem('active_userid', USER_ID)
|
||||
localStorage.setItem('active_theme', 'material')
|
||||
localStorage.setItem('active_color_scheme', 'dark')
|
||||
|
||||
expect(getThemePreference()).toBe('material')
|
||||
expect(getColorSchemePreference()).toBe('dark')
|
||||
expect(localStorage.getItem(`user_pref_theme_${USER_ID}`)).toBe('material')
|
||||
expect(localStorage.getItem(`user_pref_color_scheme_${USER_ID}`)).toBe('dark')
|
||||
})
|
||||
|
||||
it('stores OWM key per user', () => {
|
||||
setOwmApiKey(USER_ID, 'secret-key')
|
||||
expect(getOwmApiKey(USER_ID)).toBe('secret-key')
|
||||
setOwmApiKey(USER_ID, ' ')
|
||||
expect(getOwmApiKey(USER_ID)).toBe('')
|
||||
})
|
||||
|
||||
it('writes theme preferences to namespaced keys', () => {
|
||||
setThemePreference(USER_ID, 'ocean')
|
||||
setColorSchemePreference(USER_ID, 'light')
|
||||
expect(getThemePreference(USER_ID)).toBe('ocean')
|
||||
expect(getColorSchemePreference(USER_ID)).toBe('light')
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,86 @@
|
||||
const LEGACY_THEME = 'active_theme'
|
||||
const LEGACY_COLOR_SCHEME = 'active_color_scheme'
|
||||
const LEGACY_OWM_KEY = 'owm_api_key'
|
||||
|
||||
function themeKey(userId: string): string {
|
||||
return `user_pref_theme_${userId}`
|
||||
}
|
||||
|
||||
function colorSchemeKey(userId: string): string {
|
||||
return `user_pref_color_scheme_${userId}`
|
||||
}
|
||||
|
||||
function owmKey(userId: string): string {
|
||||
return `user_pref_owm_api_key_${userId}`
|
||||
}
|
||||
|
||||
export function getActiveUserId(): string | null {
|
||||
return localStorage.getItem('active_userid')
|
||||
}
|
||||
|
||||
function migrateLegacyPrefs(userId: string): void {
|
||||
const pairs: Array<{ namespaced: string; legacy: string }> = [
|
||||
{ namespaced: themeKey(userId), legacy: LEGACY_THEME },
|
||||
{ namespaced: colorSchemeKey(userId), legacy: LEGACY_COLOR_SCHEME },
|
||||
{ namespaced: owmKey(userId), legacy: LEGACY_OWM_KEY }
|
||||
]
|
||||
|
||||
for (const { namespaced, legacy } of pairs) {
|
||||
if (localStorage.getItem(namespaced) != null) continue
|
||||
const value = localStorage.getItem(legacy)
|
||||
if (value != null) {
|
||||
localStorage.setItem(namespaced, value)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function resolveUserId(userId?: string | null): string | null {
|
||||
const id = userId ?? getActiveUserId()
|
||||
if (!id) return null
|
||||
migrateLegacyPrefs(id)
|
||||
return id
|
||||
}
|
||||
|
||||
export function getThemePreference(userId?: string | null): string {
|
||||
const id = resolveUserId(userId)
|
||||
if (id) {
|
||||
return localStorage.getItem(themeKey(id)) ?? localStorage.getItem(LEGACY_THEME) ?? 'auto'
|
||||
}
|
||||
return localStorage.getItem(LEGACY_THEME) ?? 'auto'
|
||||
}
|
||||
|
||||
export function setThemePreference(userId: string, value: string): void {
|
||||
migrateLegacyPrefs(userId)
|
||||
localStorage.setItem(themeKey(userId), value)
|
||||
}
|
||||
|
||||
export function getColorSchemePreference(userId?: string | null): string {
|
||||
const id = resolveUserId(userId)
|
||||
if (id) {
|
||||
return localStorage.getItem(colorSchemeKey(id)) ?? localStorage.getItem(LEGACY_COLOR_SCHEME) ?? 'auto'
|
||||
}
|
||||
return localStorage.getItem(LEGACY_COLOR_SCHEME) ?? 'auto'
|
||||
}
|
||||
|
||||
export function setColorSchemePreference(userId: string, value: string): void {
|
||||
migrateLegacyPrefs(userId)
|
||||
localStorage.setItem(colorSchemeKey(userId), value)
|
||||
}
|
||||
|
||||
export function getOwmApiKey(userId?: string | null): string {
|
||||
const id = resolveUserId(userId)
|
||||
if (id) {
|
||||
return localStorage.getItem(owmKey(id)) ?? localStorage.getItem(LEGACY_OWM_KEY) ?? ''
|
||||
}
|
||||
return localStorage.getItem(LEGACY_OWM_KEY) ?? ''
|
||||
}
|
||||
|
||||
export function setOwmApiKey(userId: string, value: string): void {
|
||||
migrateLegacyPrefs(userId)
|
||||
const trimmed = value.trim()
|
||||
if (trimmed) {
|
||||
localStorage.setItem(owmKey(userId), trimmed)
|
||||
} else {
|
||||
localStorage.removeItem(owmKey(userId))
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,5 @@
|
||||
import { apiFetch } from './api.js'
|
||||
import { getOwmApiKey } from './userPreferences.js'
|
||||
|
||||
export class WeatherApiError extends Error {
|
||||
code: 'NO_KEY' | 'REQUEST_FAILED'
|
||||
@@ -26,7 +27,7 @@ export async function fetchOpenWeatherCurrent(params: {
|
||||
throw new WeatherApiError('lat/lon or location query required')
|
||||
}
|
||||
|
||||
const userKey = localStorage.getItem('owm_api_key')?.trim()
|
||||
const userKey = getOwmApiKey().trim()
|
||||
const headers: Record<string, string> = {}
|
||||
if (userKey) headers['X-OWM-Api-Key'] = userKey
|
||||
|
||||
|
||||
Reference in New Issue
Block a user