Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| aa52948ddc | |||
| 49b4e7b9c3 | |||
| 2d64987ada | |||
| 87973eaa4a | |||
| 93e26b7807 | |||
| 814eeadd1f |
+3
-2
@@ -17,7 +17,8 @@
|
||||
<meta name="apple-mobile-web-app-capable" content="yes" />
|
||||
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
|
||||
<meta name="apple-mobile-web-app-title" content="Daagbok" />
|
||||
<meta name="theme-color" content="#1e293b" />
|
||||
<meta name="theme-color" content="#0b0c10" />
|
||||
<script src="/appearance-bootstrap.js"></script>
|
||||
<link rel="apple-touch-icon" href="/logo.png" />
|
||||
<meta property="og:type" content="website" />
|
||||
<meta property="og:site_name" content="Kapteins Daagbok" />
|
||||
@@ -36,7 +37,7 @@
|
||||
<script defer data-domain="kapteins-daagbok.eu" src="https://plausible.elpatron.me/js/script.tagged-events.js"></script>
|
||||
<title>Kapteins Daagbok – Kostenloses digitales Yacht-Logbuch (werbefrei)</title>
|
||||
</head>
|
||||
<body style="margin:0;background:#0b0c10;color:#e2e8f0">
|
||||
<body>
|
||||
<div id="root"></div>
|
||||
<script type="module" src="/src/main.tsx"></script>
|
||||
</body>
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
/**
|
||||
* Applies saved appearance classes before CSS/JS bundle loads (prevents wrong flash on PWA).
|
||||
* Logic mirrors client/src/services/appearance.ts + userPreferences.ts.
|
||||
*/
|
||||
(function () {
|
||||
try {
|
||||
var uid = localStorage.getItem('active_userid')
|
||||
var theme = 'auto'
|
||||
var scheme = 'auto'
|
||||
|
||||
if (uid) {
|
||||
theme =
|
||||
localStorage.getItem('user_pref_theme_' + uid) ||
|
||||
localStorage.getItem('active_theme') ||
|
||||
'auto'
|
||||
scheme =
|
||||
localStorage.getItem('user_pref_color_scheme_' + uid) ||
|
||||
localStorage.getItem('active_color_scheme') ||
|
||||
'auto'
|
||||
} else {
|
||||
theme = localStorage.getItem('active_theme') || 'auto'
|
||||
scheme = localStorage.getItem('active_color_scheme') || 'auto'
|
||||
}
|
||||
|
||||
var resolvedTheme = theme
|
||||
if (resolvedTheme !== 'ocean' && resolvedTheme !== 'material' && resolvedTheme !== 'cupertino') {
|
||||
var ua = navigator.userAgent || navigator.vendor || ''
|
||||
if (/iPad|iPhone|iPod|Macintosh/.test(ua)) resolvedTheme = 'cupertino'
|
||||
else if (/Android|Linux/.test(ua)) resolvedTheme = 'material'
|
||||
else resolvedTheme = 'ocean'
|
||||
}
|
||||
|
||||
var resolvedScheme = scheme
|
||||
if (resolvedScheme !== 'light' && resolvedScheme !== 'dark') {
|
||||
resolvedScheme = window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light'
|
||||
}
|
||||
|
||||
var root = document.documentElement
|
||||
root.classList.add('theme-' + resolvedTheme, 'scheme-' + resolvedScheme)
|
||||
root.style.colorScheme = resolvedScheme
|
||||
} catch (_) {
|
||||
/* ignore storage / matchMedia errors */
|
||||
}
|
||||
})()
|
||||
+22
-4
@@ -8,6 +8,18 @@ body {
|
||||
color: var(--app-text);
|
||||
}
|
||||
|
||||
code {
|
||||
font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, 'Liberation Mono', 'Courier New', monospace;
|
||||
color: var(--app-input-text);
|
||||
background: var(--app-icon-btn-bg);
|
||||
border: 1px solid var(--app-icon-btn-border);
|
||||
font-size: 15px;
|
||||
line-height: 135%;
|
||||
padding: 4px 8px;
|
||||
border-radius: 4px;
|
||||
display: inline-flex;
|
||||
}
|
||||
|
||||
#root:has(.auth-screen) {
|
||||
width: 100%;
|
||||
max-width: none;
|
||||
@@ -1046,6 +1058,7 @@ html.scheme-dark .themed-select-option.is-selected {
|
||||
.profile-dl-row dd {
|
||||
margin: 0;
|
||||
font-size: 14px;
|
||||
color: var(--app-text);
|
||||
word-break: break-word;
|
||||
text-align: left;
|
||||
justify-self: start;
|
||||
@@ -1059,8 +1072,6 @@ html.scheme-dark .themed-select-option.is-selected {
|
||||
|
||||
.profile-user-id code {
|
||||
font-size: 12px;
|
||||
background: rgba(148, 163, 184, 0.08);
|
||||
padding: 4px 8px;
|
||||
border-radius: 6px;
|
||||
word-break: break-all;
|
||||
}
|
||||
@@ -1127,8 +1138,8 @@ html.scheme-dark .themed-select-option.is-selected {
|
||||
gap: 12px;
|
||||
padding: 10px 12px;
|
||||
border-radius: 10px;
|
||||
background: rgba(148, 163, 184, 0.06);
|
||||
border: 1px solid rgba(148, 163, 184, 0.12);
|
||||
background: var(--app-icon-btn-bg);
|
||||
border: 1px solid var(--app-icon-btn-border);
|
||||
}
|
||||
|
||||
.profile-passkey-main {
|
||||
@@ -1241,6 +1252,7 @@ html.scheme-dark .themed-select-option.is-selected {
|
||||
display: block;
|
||||
font-family: ui-monospace, monospace;
|
||||
font-size: 13px;
|
||||
color: var(--app-input-text);
|
||||
}
|
||||
|
||||
.profile-passkey-transports {
|
||||
@@ -2172,6 +2184,12 @@ html.scheme-dark .themed-select-option.is-selected {
|
||||
100% { background-position: 0 0; }
|
||||
}
|
||||
|
||||
.conn-status.syncing {
|
||||
background: rgba(59, 130, 246, 0.1);
|
||||
color: #60a5fa;
|
||||
border: 1px solid rgba(59, 130, 246, 0.25);
|
||||
}
|
||||
|
||||
.conn-status.warning {
|
||||
background: rgba(251, 191, 36, 0.1);
|
||||
color: #fbbf24;
|
||||
|
||||
@@ -31,7 +31,7 @@ export default function LogbookDashboard({ onSelectLogbook, onLogout, onOpenProf
|
||||
const [online, setOnline] = useState(navigator.onLine)
|
||||
const [username] = useState(localStorage.getItem('active_username') || 'Skipper')
|
||||
|
||||
const { pendingCount, showSpinner, showPendingWarning } = useSyncIndicator()
|
||||
const { pendingCount, showSpinner, showPendingWarning, connStatusClassName } = useSyncIndicator()
|
||||
|
||||
// Listen to connectivity changes
|
||||
useEffect(() => {
|
||||
@@ -271,7 +271,7 @@ export default function LogbookDashboard({ onSelectLogbook, onLogout, onOpenProf
|
||||
<div className="header-actions">
|
||||
{/* Connection Indicator */}
|
||||
<div
|
||||
className={`conn-status ${online ? (pendingCount > 0 ? 'unsynced' : 'online') : 'offline'}`}
|
||||
className={connStatusClassName(online)}
|
||||
title={
|
||||
online
|
||||
? showSpinner
|
||||
|
||||
@@ -129,7 +129,12 @@ export default function UserProfilePage({ onBack, onLogout }: UserProfilePagePro
|
||||
const [pendingRecoveryPhrase, setPendingRecoveryPhrase] = useState<string | null>(null)
|
||||
const [recoveryCopied, setRecoveryCopied] = useState(false)
|
||||
|
||||
const { pendingCount: pendingSyncCount, showSpinner, showPendingWarning } = useSyncIndicator()
|
||||
const {
|
||||
pendingCount: pendingSyncCount,
|
||||
showSpinner,
|
||||
showPendingWarning,
|
||||
connStatusClassName
|
||||
} = useSyncIndicator()
|
||||
|
||||
const sharedLogbookCount = useLiveQuery(
|
||||
() => db.logbooks.filter((lb) => lb.isShared === 1).count(),
|
||||
@@ -528,7 +533,7 @@ export default function UserProfilePage({ onBack, onLogout }: UserProfilePagePro
|
||||
<h3>{t('profile.device_title')}</h3>
|
||||
</div>
|
||||
<p className="profile-section-desc">{t('profile.device_desc')}</p>
|
||||
<div className={`profile-device-status conn-status ${online ? (pendingSyncCount > 0 ? 'warning' : 'online') : 'offline'}`}>
|
||||
<div className={`profile-device-status ${connStatusClassName(online)}`}>
|
||||
{online ? (
|
||||
showSpinner ? (
|
||||
<>
|
||||
|
||||
@@ -3,6 +3,20 @@ import { useLiveQuery } from 'dexie-react-hooks'
|
||||
import { db } from '../services/db.js'
|
||||
import { subscribeToSyncState } from '../services/sync.js'
|
||||
|
||||
export type SyncConnStatusVariant = 'offline' | 'syncing' | 'pending' | 'online'
|
||||
|
||||
/** Maps sync/online state to conn-status CSS modifier classes. */
|
||||
export function syncConnStatusClassName(
|
||||
online: boolean,
|
||||
showSpinner: boolean,
|
||||
pendingCount: number
|
||||
): string {
|
||||
if (!online) return 'conn-status offline'
|
||||
if (showSpinner) return 'conn-status syncing'
|
||||
if (pendingCount > 0) return 'conn-status warning'
|
||||
return 'conn-status online'
|
||||
}
|
||||
|
||||
/** Sync queue depth and whether a sync pass is running (for header indicators). */
|
||||
export function useSyncIndicator(logbookId?: string | null) {
|
||||
const [isSyncing, setIsSyncing] = useState(false)
|
||||
@@ -16,13 +30,19 @@ export function useSyncIndicator(logbookId?: string | null) {
|
||||
[logbookId]
|
||||
) ?? 0
|
||||
|
||||
useEffect(() => subscribeToSyncState(setIsSyncing), [])
|
||||
useEffect(() => {
|
||||
return subscribeToSyncState(setIsSyncing)
|
||||
}, [])
|
||||
|
||||
const showSpinner = isSyncing
|
||||
const showPendingWarning = pendingCount > 0 && !isSyncing
|
||||
|
||||
return {
|
||||
isSyncing,
|
||||
pendingCount,
|
||||
/** Spin only while a sync pass is active — not for stale queue counts. */
|
||||
showSpinner: isSyncing,
|
||||
showPendingWarning: pendingCount > 0 && !isSyncing
|
||||
showSpinner,
|
||||
showPendingWarning,
|
||||
connStatusClassName: (online: boolean) =>
|
||||
syncConnStatusClassName(online, showSpinner, pendingCount)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -100,12 +100,10 @@ code,
|
||||
font-family: var(--mono);
|
||||
display: inline-flex;
|
||||
border-radius: 4px;
|
||||
color: var(--text-h);
|
||||
}
|
||||
|
||||
code {
|
||||
font-size: 15px;
|
||||
line-height: 135%;
|
||||
padding: 4px 8px;
|
||||
background: var(--code-bg);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,70 @@
|
||||
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
import {
|
||||
applyAppearanceToDocument,
|
||||
resolveAppTheme,
|
||||
resolveColorScheme,
|
||||
type AppTheme,
|
||||
type ResolvedColorScheme
|
||||
} from './appearance.js'
|
||||
import { setColorSchemePreference } from './userPreferences.js'
|
||||
|
||||
const USER_ID = 'appearance-test-user'
|
||||
|
||||
const COMBOS: Array<{ theme: AppTheme; scheme: ResolvedColorScheme }> = [
|
||||
{ theme: 'ocean', scheme: 'dark' },
|
||||
{ theme: 'ocean', scheme: 'light' },
|
||||
{ theme: 'material', scheme: 'dark' },
|
||||
{ theme: 'material', scheme: 'light' },
|
||||
{ theme: 'cupertino', scheme: 'dark' },
|
||||
{ theme: 'cupertino', scheme: 'light' }
|
||||
]
|
||||
|
||||
describe('appearance', () => {
|
||||
beforeEach(() => {
|
||||
localStorage.clear()
|
||||
document.documentElement.className = ''
|
||||
document.documentElement.style.colorScheme = ''
|
||||
document.head.querySelector('meta[name="theme-color"]')?.remove()
|
||||
})
|
||||
|
||||
it.each(COMBOS)('applies $theme · $scheme classes to document', ({ theme, scheme }) => {
|
||||
applyAppearanceToDocument(theme, scheme)
|
||||
|
||||
const root = document.documentElement
|
||||
expect(root.classList.contains(`theme-${theme}`)).toBe(true)
|
||||
expect(root.classList.contains(`scheme-${scheme}`)).toBe(true)
|
||||
expect(root.style.colorScheme).toBe(scheme)
|
||||
})
|
||||
|
||||
it('replaces previous theme classes when switching appearance', () => {
|
||||
applyAppearanceToDocument('ocean', 'dark')
|
||||
applyAppearanceToDocument('material', 'light')
|
||||
|
||||
const root = document.documentElement
|
||||
expect(root.classList.contains('theme-material')).toBe(true)
|
||||
expect(root.classList.contains('theme-ocean')).toBe(false)
|
||||
expect(root.classList.contains('scheme-light')).toBe(true)
|
||||
expect(root.classList.contains('scheme-dark')).toBe(false)
|
||||
})
|
||||
|
||||
it('resolves stored light scheme even when system prefers dark', () => {
|
||||
vi.stubGlobal(
|
||||
'matchMedia',
|
||||
vi.fn().mockReturnValue({ matches: true, addEventListener: vi.fn(), removeEventListener: vi.fn() })
|
||||
)
|
||||
localStorage.setItem('active_userid', USER_ID)
|
||||
setColorSchemePreference(USER_ID, 'light')
|
||||
|
||||
expect(resolveColorScheme()).toBe('light')
|
||||
applyAppearanceToDocument('material', resolveColorScheme())
|
||||
expect(document.documentElement.classList.contains('scheme-light')).toBe(true)
|
||||
})
|
||||
|
||||
it('auto theme picks material on Android user agent', () => {
|
||||
vi.stubGlobal('navigator', {
|
||||
...navigator,
|
||||
userAgent: 'Mozilla/5.0 (Linux; Android 14) AppleWebKit/537.36'
|
||||
})
|
||||
expect(resolveAppTheme()).toBe('material')
|
||||
})
|
||||
})
|
||||
@@ -31,6 +31,18 @@ export function resolveAppTheme(): AppTheme {
|
||||
return 'ocean'
|
||||
}
|
||||
|
||||
function updateThemeColorMeta(root: HTMLElement): void {
|
||||
const color = getComputedStyle(root).getPropertyValue('--app-theme-color').trim()
|
||||
if (!color) return
|
||||
let meta = document.querySelector('meta[name="theme-color"]')
|
||||
if (!meta) {
|
||||
meta = document.createElement('meta')
|
||||
meta.setAttribute('name', 'theme-color')
|
||||
document.head.appendChild(meta)
|
||||
}
|
||||
meta.setAttribute('content', color)
|
||||
}
|
||||
|
||||
export function applyAppearanceToDocument(
|
||||
theme: AppTheme = resolveAppTheme(),
|
||||
scheme: ResolvedColorScheme = resolveColorScheme()
|
||||
@@ -39,6 +51,7 @@ export function applyAppearanceToDocument(
|
||||
root.classList.remove(...THEME_CLASSES, ...SCHEME_CLASSES)
|
||||
root.classList.add(`theme-${theme}`, `scheme-${scheme}`)
|
||||
root.style.colorScheme = scheme
|
||||
updateThemeColorMeta(root)
|
||||
}
|
||||
|
||||
export function subscribeToSystemColorScheme(onChange: () => void): () => void {
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
/* Fallback before JS hydrates (ocean · dark) */
|
||||
html {
|
||||
color-scheme: dark;
|
||||
--app-theme-color: #0b0c10;
|
||||
--app-body-bg: radial-gradient(circle at center, #1b264f 0%, #0b0c10 100%);
|
||||
--app-text: #f1f5f9;
|
||||
--app-text-heading: #f8fafc;
|
||||
@@ -61,6 +62,7 @@ html {
|
||||
/* ===== OCEAN · DARK (default) ===== */
|
||||
html.scheme-dark.theme-ocean {
|
||||
color-scheme: dark;
|
||||
--app-theme-color: #0b0c10;
|
||||
--app-body-bg: radial-gradient(circle at center, #1b264f 0%, #0b0c10 100%);
|
||||
--app-text: #f1f5f9;
|
||||
--app-text-heading: #f8fafc;
|
||||
@@ -116,6 +118,7 @@ html.scheme-dark.theme-ocean {
|
||||
/* ===== OCEAN · LIGHT ===== */
|
||||
html.scheme-light.theme-ocean {
|
||||
color-scheme: light;
|
||||
--app-theme-color: #e2e8f0;
|
||||
--app-body-bg: linear-gradient(165deg, #dbeafe 0%, #f8fafc 42%, #e2e8f0 100%);
|
||||
--app-text: #1e293b;
|
||||
--app-text-heading: #0f172a;
|
||||
@@ -171,6 +174,7 @@ html.scheme-light.theme-ocean {
|
||||
/* ===== MATERIAL · DARK ===== */
|
||||
html.scheme-dark.theme-material {
|
||||
color-scheme: dark;
|
||||
--app-theme-color: #121212;
|
||||
--app-body-bg: #121212;
|
||||
--app-text: #f1f5f9;
|
||||
--app-text-heading: #f8fafc;
|
||||
@@ -226,6 +230,7 @@ html.scheme-dark.theme-material {
|
||||
/* ===== MATERIAL · LIGHT ===== */
|
||||
html.scheme-light.theme-material {
|
||||
color-scheme: light;
|
||||
--app-theme-color: #fafafa;
|
||||
--app-body-bg: #fafafa;
|
||||
--app-text: #212121;
|
||||
--app-text-heading: #111827;
|
||||
@@ -281,6 +286,7 @@ html.scheme-light.theme-material {
|
||||
/* ===== CUPERTINO · DARK ===== */
|
||||
html.scheme-dark.theme-cupertino {
|
||||
color-scheme: dark;
|
||||
--app-theme-color: #000000;
|
||||
--app-body-bg: #000000;
|
||||
--app-text: #ffffff;
|
||||
--app-text-heading: #ffffff;
|
||||
@@ -336,6 +342,7 @@ html.scheme-dark.theme-cupertino {
|
||||
/* ===== CUPERTINO · LIGHT ===== */
|
||||
html.scheme-light.theme-cupertino {
|
||||
color-scheme: light;
|
||||
--app-theme-color: #f2f2f7;
|
||||
--app-body-bg: #f2f2f7;
|
||||
--app-text: #1c1c1e;
|
||||
--app-text-heading: #000000;
|
||||
@@ -396,3 +403,12 @@ html.scheme-light.theme-cupertino {
|
||||
html.scheme-light #root {
|
||||
border-inline-color: var(--app-border-subtle);
|
||||
}
|
||||
|
||||
/* Bridge legacy index.css tokens to appearance (avoids system color-scheme drift) */
|
||||
html.scheme-light,
|
||||
html.scheme-dark {
|
||||
--text: var(--app-text);
|
||||
--text-h: var(--app-text-heading);
|
||||
--code-bg: var(--app-icon-btn-bg);
|
||||
--border: var(--app-border-subtle);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user