@@ -67,9 +81,17 @@ export async function render(container) {
const submitBtn = container.querySelector('#login-btn');
const versionEl = container.querySelector('#login-version');
- fetch(VERSION_URL)
+ setAppBranding(storedAppName);
+
+ fetch(VERSION_URL, { cache: 'no-store' })
.then((r) => r.json())
- .then((d) => { versionEl.textContent = t('login.version', { version: d.version }); })
+ .then((d) => {
+ if (d?.app_name) {
+ try { localStorage.setItem(APP_NAME_STORAGE_KEY, d.app_name); } catch (_) {}
+ setAppBranding(d.app_name);
+ }
+ versionEl.textContent = t('login.version', { version: d.version });
+ })
.catch(() => {});
form.addEventListener('submit', async (e) => {
diff --git a/public/pages/settings.js b/public/pages/settings.js
index 8a3d45d..7d1f6bd 100644
--- a/public/pages/settings.js
+++ b/public/pages/settings.js
@@ -12,6 +12,8 @@ import '/components/oikos-locale-picker.js';
const SUPPORTED_CURRENCIES = ['AED', 'AUD', 'BRL', 'CAD', 'CHF', 'CNY', 'CZK', 'DKK', 'EUR', 'GBP', 'HUF', 'INR', 'JPY', 'NOK', 'PLN', 'RUB', 'SAR', 'SEK', 'TRY', 'UAH', 'USD'];
const SETTINGS_TAB_KEY = 'oikos:settings:tab';
+const APP_NAME_STORAGE_KEY = 'oikos-app-name';
+const DEFAULT_APP_NAME = 'Oikos';
const CATEGORY_I18N = {
'Obst & Gemüse': 'shopping.catFruitVeg',
@@ -56,7 +58,7 @@ export async function render(container, { user }) {
let users = [];
let googleStatus = { configured: false, connected: false, lastSync: null };
let appleStatus = { configured: false, lastSync: null };
- let prefs = { visible_meal_types: ['breakfast', 'lunch', 'dinner', 'snack'], currency: 'EUR' };
+ let prefs = { visible_meal_types: ['breakfast', 'lunch', 'dinner', 'snack'], currency: 'EUR', date_format: 'mdy', app_name: DEFAULT_APP_NAME };
let categories = [];
let icsSubscriptions = [];
let apiTokens = [];
@@ -80,6 +82,13 @@ export async function render(container, { user }) {
if (apiTokensRes.status === 'fulfilled') apiTokens = apiTokensRes.value.data ?? [];
} catch (_) { /* non-critical */ }
+ if (prefs.date_format) {
+ try { localStorage.setItem('oikos-date-format', prefs.date_format); } catch (_) {}
+ }
+ if (prefs.app_name) {
+ try { localStorage.setItem(APP_NAME_STORAGE_KEY, prefs.app_name); } catch (_) {}
+ }
+
const googleStatusText = googleStatus.connected
? (googleStatus.lastSync ? t('settings.connectedLastSync', { date: formatDateTime(googleStatus.lastSync) }) : t('settings.connected'))
: googleStatus.configured ? t('settings.notConnected') : t('settings.notConfigured');
@@ -139,6 +148,48 @@ export async function render(container, { user }) {
+ ${user?.role === 'admin' ? `
+
${t('settings.languageTitle')}
@@ -514,6 +565,58 @@ function bindEvents(container, user, categories, icsSubscriptions, apiTokens) {
});
}
+ const dateFormatSelect = container.querySelector('#date-format-select');
+ if (dateFormatSelect) {
+ dateFormatSelect.addEventListener('change', async () => {
+ try {
+ await api.put('/preferences', { date_format: dateFormatSelect.value });
+ try { localStorage.setItem('oikos-date-format', dateFormatSelect.value); } catch (_) {}
+ window.dispatchEvent(new CustomEvent('date-format-changed', { detail: { dateFormat: dateFormatSelect.value } }));
+ window.oikos?.showToast(t('settings.dateFormatSavedToast'), 'success');
+ } catch (err) {
+ window.oikos?.showToast(err.message ?? t('common.errorGeneric'), 'danger');
+ }
+ });
+ }
+
+ const appNameForm = container.querySelector('#app-name-form');
+ if (appNameForm) {
+ appNameForm.addEventListener('submit', async (e) => {
+ e.preventDefault();
+ const errorEl = container.querySelector('#app-name-error');
+ const input = container.querySelector('#app-name-input');
+ errorEl.hidden = true;
+ const value = input.value.trim();
+ try {
+ await api.put('/preferences', { app_name: value });
+ try {
+ if (value) localStorage.setItem(APP_NAME_STORAGE_KEY, value);
+ else localStorage.removeItem(APP_NAME_STORAGE_KEY);
+ } catch (_) {}
+ input.value = value || DEFAULT_APP_NAME;
+ window.dispatchEvent(new CustomEvent('app-name-changed', { detail: { appName: value || DEFAULT_APP_NAME } }));
+ window.oikos?.showToast(t('settings.appNameSavedToast'), 'success');
+ } catch (err) {
+ showError(errorEl, err.message ?? t('common.errorGeneric'));
+ }
+ });
+
+ container.querySelector('#app-name-reset-btn')?.addEventListener('click', async () => {
+ const errorEl = container.querySelector('#app-name-error');
+ const input = container.querySelector('#app-name-input');
+ errorEl.hidden = true;
+ input.value = DEFAULT_APP_NAME;
+ try {
+ await api.put('/preferences', { app_name: '' });
+ try { localStorage.removeItem(APP_NAME_STORAGE_KEY); } catch (_) {}
+ window.dispatchEvent(new CustomEvent('app-name-changed', { detail: { appName: DEFAULT_APP_NAME } }));
+ window.oikos?.showToast(t('settings.appNameSavedToast'), 'success');
+ } catch (err) {
+ showError(errorEl, err.message ?? t('common.errorGeneric'));
+ }
+ });
+ }
+
// Passwort ändern
const passwordForm = container.querySelector('#password-form');
if (passwordForm) {
diff --git a/public/router.js b/public/router.js
index f07aabd..4d3b514 100644
--- a/public/router.js
+++ b/public/router.js
@@ -19,6 +19,7 @@ const ROUTES = [
{ path: '/shopping', page: '/pages/shopping.js', requiresAuth: true, module: 'shopping' },
{ path: '/meals', page: '/pages/meals.js', requiresAuth: true, module: 'meals' },
{ path: '/calendar', page: '/pages/calendar.js', requiresAuth: true, module: 'calendar' },
+ { path: '/birthdays', page: '/pages/birthdays.js', requiresAuth: true, module: 'birthdays' },
{ path: '/notes', page: '/pages/notes.js', requiresAuth: true, module: 'notes' },
{ path: '/recipes', page: '/pages/recipes.js', requiresAuth: true, module: 'recipes' },
{ path: '/contacts', page: '/pages/contacts.js', requiresAuth: true, module: 'contacts' },
@@ -116,6 +117,7 @@ async function importPage(pagePath) {
let currentUser = null;
let currentPath = null;
let isNavigating = false;
+let _preferencesLoaded = false;
// Gesetzt wenn auth:expired waehrend einer laufenden Navigation feuert.
// Die Weiterleitung zu /login wird nach Abschluss der Navigation nachgeholt.
let _pendingLoginRedirect = false;
@@ -124,11 +126,14 @@ let _pendingLoginRedirect = false;
// Router
// --------------------------------------------------------
-const ROUTE_ORDER = ['/', '/tasks', '/calendar', '/meals', '/recipes', '/shopping',
+const ROUTE_ORDER = ['/', '/tasks', '/calendar', '/birthdays', '/meals', '/recipes', '/shopping',
'/notes', '/contacts', '/budget', '/settings'];
const PRIMARY_NAV = 4;
+const DEFAULT_APP_NAME = 'Oikos';
+const APP_NAME_STORAGE_KEY = 'oikos-app-name';
+
function getDirection(fromPath, toPath) {
const fromIdx = ROUTE_ORDER.indexOf(fromPath ?? '/');
const toIdx = ROUTE_ORDER.indexOf(toPath);
@@ -136,6 +141,53 @@ function getDirection(fromPath, toPath) {
return toIdx > fromIdx ? 'right' : 'left';
}
+function getAppName() {
+ return localStorage.getItem(APP_NAME_STORAGE_KEY) || DEFAULT_APP_NAME;
+}
+
+function setAppName(name) {
+ const next = String(name || '').trim();
+ if (next) {
+ localStorage.setItem(APP_NAME_STORAGE_KEY, next);
+ } else {
+ localStorage.removeItem(APP_NAME_STORAGE_KEY);
+ }
+}
+
+function routeTitle(path) {
+ const map = {
+ '/': t('dashboard.title'),
+ '/tasks': t('nav.tasks'),
+ '/calendar': t('nav.calendar'),
+ '/birthdays': t('nav.birthdays'),
+ '/meals': t('nav.meals'),
+ '/recipes': t('nav.recipes'),
+ '/shopping': t('nav.shopping'),
+ '/notes': t('nav.notes'),
+ '/contacts': t('nav.contacts'),
+ '/budget': t('nav.budget'),
+ '/settings': t('nav.settings'),
+ };
+ return map[path] || getAppName();
+}
+
+function updateBranding(path = currentPath) {
+ const appName = getAppName();
+ const sidebarLogoSpan = document.querySelector('.nav-sidebar__logo span');
+ if (sidebarLogoSpan) sidebarLogoSpan.textContent = appName;
+
+ const loginTitle = document.querySelector('.login-hero__title');
+ if (path === '/login' && loginTitle) loginTitle.textContent = appName;
+
+ document.title = path === '/login'
+ ? appName
+ : `${routeTitle(path || '/')} · ${appName}`;
+
+ document.querySelectorAll('meta[name="apple-mobile-web-app-title"]').forEach((meta) => {
+ meta.setAttribute('content', appName);
+ });
+}
+
/**
* Navigiert zu einem Pfad und rendert die entsprechende Seite.
* @param {string} path
@@ -151,6 +203,7 @@ async function navigate(path, userOrPushState = true, pushState = true) {
// Überlastung: navigate(path, user) nach Login vs navigate(path, false) beim Init
if (typeof userOrPushState === 'object' && userOrPushState !== null) {
currentUser = userOrPushState;
+ await syncPreferencesOnce();
initReminders();
} else {
pushState = userOrPushState;
@@ -168,6 +221,7 @@ async function navigate(path, userOrPushState = true, pushState = true) {
try {
const result = await auth.me();
currentUser = result.user;
+ await syncPreferencesOnce();
initReminders();
} catch {
currentPath = null; // Reset damit navigate('/login') nicht geblockt wird
@@ -198,6 +252,7 @@ async function navigate(path, userOrPushState = true, pushState = true) {
await renderPage(route, previousPath);
updateNav(basePath);
updateThemeColorForRoute(route);
+ updateBranding(basePath);
} finally {
isNavigating = false;
// auth:expired kann waehrend einer Navigation gefeuert haben (z.B. wenn ein
@@ -210,6 +265,24 @@ async function navigate(path, userOrPushState = true, pushState = true) {
}
}
+async function syncPreferencesOnce() {
+ if (_preferencesLoaded) return;
+ _preferencesLoaded = true;
+ try {
+ const res = await api.get('/preferences');
+ const dateFormat = res?.data?.date_format;
+ if (dateFormat) {
+ localStorage.setItem('oikos-date-format', dateFormat);
+ }
+ if (res?.data?.app_name) {
+ setAppName(res.data.app_name);
+ updateBranding();
+ }
+ } catch {
+ // Non-critical. The settings page can refresh this later.
+ }
+}
+
/**
* Lädt und rendert eine Seite dynamisch.
* @param {{ path: string, page: string }} route
@@ -352,7 +425,7 @@ function renderAppShell(container) {
sidebarLogo.appendChild(logomark);
const sidebarLogoSpan = document.createElement('span');
- sidebarLogoSpan.textContent = 'Oikos';
+ sidebarLogoSpan.textContent = getAppName();
sidebarLogo.appendChild(sidebarLogoSpan);
const sidebarItems = document.createElement('div');
sidebarItems.className = 'nav-sidebar__items';
@@ -455,6 +528,7 @@ function renderAppShell(container) {
routeAnnouncer.setAttribute('aria-atomic', 'true');
container.replaceChildren(skipLink, sidebar, main, bottomNav, backdrop, moreSheet, searchOverlay, toastContainer, routeAnnouncer);
+ updateBranding(currentPath || '/');
// Klick-Handler für alle Nav-Links
container.querySelectorAll('[data-route]').forEach((el) => {
@@ -658,6 +732,7 @@ function navItems() {
return [
{ path: '/', label: t('nav.dashboard'), icon: 'layout-dashboard' },
{ path: '/tasks', label: t('nav.tasks'), icon: 'check-square' },
+ { path: '/birthdays', label: t('nav.birthdays'), icon: 'cake' },
{ path: '/calendar', label: t('nav.calendar'), icon: 'calendar' },
{ path: '/meals', label: t('nav.meals'), icon: 'utensils' },
{ path: '/recipes', label: t('nav.recipes'), icon: 'book-text' },
@@ -900,6 +975,11 @@ window.addEventListener('locale-changed', () => {
});
updateNav(currentPath);
+ updateBranding(currentPath || '/');
+});
+
+window.addEventListener('app-name-changed', () => {
+ updateBranding(currentPath || '/');
});
// --------------------------------------------------------
diff --git a/public/styles/birthdays.css b/public/styles/birthdays.css
new file mode 100644
index 0000000..fec9324
--- /dev/null
+++ b/public/styles/birthdays.css
@@ -0,0 +1,331 @@
+.birthdays-page { --module-accent: var(--module-birthdays); }
+
+.birthdays-page {
+ display: flex;
+ flex-direction: column;
+ gap: var(--space-4);
+ max-width: var(--content-max-width);
+ margin: 0 auto;
+ padding-bottom: calc(var(--nav-bottom-height) + var(--space-6));
+}
+
+.birthdays-grid {
+ display: grid;
+ grid-template-columns: minmax(280px, 360px) minmax(0, 1fr);
+ gap: var(--space-4);
+ padding: 0 var(--space-4);
+}
+
+.birthdays-panel {
+ display: flex;
+ flex-direction: column;
+ gap: var(--space-4);
+ padding: var(--space-4);
+ border: 1px solid var(--color-border);
+ border-radius: calc(var(--radius-md) + 4px);
+ background:
+ radial-gradient(circle at top left, color-mix(in srgb, var(--module-accent) 10%, transparent), transparent 45%),
+ var(--color-surface);
+ box-shadow: var(--shadow-sm);
+}
+
+.birthdays-panel--upcoming {
+ position: sticky;
+ top: var(--space-4);
+ align-self: start;
+}
+
+.birthdays-panel--list {
+ min-width: 0;
+}
+
+.birthdays-toolbar {
+ display: flex;
+ align-items: center;
+ gap: var(--space-2);
+ padding: var(--space-3) var(--space-4);
+ border-bottom: 1px solid var(--color-border);
+ border-top: 3px solid var(--module-accent);
+ background: var(--color-surface);
+}
+
+.birthdays-toolbar__title {
+ display: inline-flex;
+ align-items: center;
+ gap: var(--space-2);
+ min-width: 0;
+ flex: 1;
+ font-size: var(--text-lg);
+ font-weight: var(--font-weight-bold);
+}
+
+.birthdays-toolbar__title-icon {
+ width: 20px;
+ height: 20px;
+ color: var(--module-accent);
+ flex-shrink: 0;
+}
+
+.birthdays-toolbar__subtitle {
+ margin: 0 var(--space-4) var(--space-2);
+ color: var(--color-text-secondary);
+ font-size: var(--text-sm);
+}
+
+.birthdays-toolbar--embedded {
+ padding: 0;
+ border: none;
+ background: transparent;
+}
+
+.birthdays-toolbar__search {
+ flex: 1;
+ position: relative;
+}
+
+.birthdays-toolbar__search-icon {
+ position: absolute;
+ left: var(--space-3);
+ top: 50%;
+ transform: translateY(-50%);
+ width: 16px;
+ height: 16px;
+ color: var(--color-text-disabled);
+ pointer-events: none;
+}
+
+.birthdays-toolbar__search-input {
+ width: 100%;
+ min-height: 40px;
+ padding: var(--space-2) var(--space-3) var(--space-2) 36px;
+ border-radius: var(--radius-glass-button);
+ border: 1.5px solid var(--glass-border-subtle);
+ background: var(--color-surface-2);
+}
+
+.birthdays-section {
+ padding: 0 var(--space-4);
+}
+
+.birthdays-section__header h2,
+.birthdays-section__header h3 {
+ margin: 0;
+ font-size: var(--text-lg);
+}
+
+.birthdays-section__header p {
+ margin: var(--space-1) 0 0;
+ color: var(--color-text-secondary);
+ font-size: var(--text-sm);
+}
+
+.birthday-cards {
+ display: grid;
+ grid-template-columns: 1fr;
+ gap: var(--space-3);
+}
+
+.birthday-card,
+.birthday-item {
+ background: var(--color-surface);
+ border: 1px solid var(--color-border);
+ border-radius: var(--radius-md);
+ box-shadow: var(--shadow-sm);
+}
+
+.birthday-card {
+ display: flex;
+ align-items: center;
+ gap: var(--space-3);
+ padding: var(--space-4);
+ background: linear-gradient(180deg, color-mix(in srgb, var(--module-accent) 6%, var(--color-surface)), var(--color-surface));
+}
+
+.birthday-card__body,
+.birthday-item__body {
+ min-width: 0;
+ flex: 1;
+}
+
+.birthday-card__top {
+ display: flex;
+ align-items: flex-start;
+ justify-content: space-between;
+ gap: var(--space-3);
+}
+
+.birthday-card__name,
+.birthday-item__name {
+ font-size: var(--text-base);
+ font-weight: var(--font-weight-semibold);
+}
+
+.birthday-card__date,
+.birthday-item__meta,
+.birthday-item__next {
+ color: var(--color-text-secondary);
+ font-size: var(--text-sm);
+}
+
+.birthday-card__note,
+.birthday-item__note,
+.birthday-item__notes {
+ margin-top: var(--space-1);
+ font-size: var(--text-sm);
+}
+
+.birthday-card__pill {
+ padding: 0.35rem 0.6rem;
+ border-radius: var(--radius-full);
+ background: color-mix(in srgb, var(--module-accent) 12%, transparent);
+ color: var(--module-accent);
+ font-size: var(--text-xs);
+ font-weight: var(--font-weight-semibold);
+ white-space: nowrap;
+}
+
+.birthday-item__notes {
+ color: var(--color-text-secondary);
+}
+
+.birthdays-list {
+ display: flex;
+ flex-direction: column;
+ gap: var(--space-3);
+}
+
+.birthday-item {
+ display: flex;
+ align-items: center;
+ gap: var(--space-3);
+ padding: var(--space-4);
+}
+
+.birthday-item__row {
+ display: flex;
+ align-items: baseline;
+ justify-content: space-between;
+ gap: var(--space-2);
+}
+
+.birthday-item__actions {
+ display: flex;
+ gap: var(--space-1);
+}
+
+.birthday-avatar {
+ width: 56px;
+ height: 56px;
+ border-radius: var(--radius-full);
+ object-fit: cover;
+ flex-shrink: 0;
+}
+
+.birthday-avatar--fallback {
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ background: color-mix(in srgb, var(--module-accent) 16%, white);
+ color: var(--module-accent);
+ font-weight: var(--font-weight-bold);
+}
+
+.birthday-avatar--xs {
+ width: 34px;
+ height: 34px;
+ font-size: var(--text-sm);
+}
+
+.birthdays-autocomplete {
+ position: absolute;
+ top: calc(100% + 6px);
+ left: 0;
+ right: 0;
+ z-index: var(--z-dropdown);
+ border-radius: var(--radius-md);
+ border: 1px solid var(--color-border);
+ background: var(--color-surface-elevated);
+ box-shadow: var(--shadow-lg);
+ overflow: hidden;
+}
+
+.birthday-suggestion {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ gap: var(--space-2);
+ padding: var(--space-2) var(--space-3);
+ border: none;
+ background: transparent;
+ text-align: left;
+ cursor: pointer;
+}
+
+.birthday-suggestion:hover {
+ background: var(--color-surface-hover);
+}
+
+.birthday-suggestion span {
+ display: flex;
+ min-width: 0;
+ flex-direction: column;
+}
+
+.birthday-suggestion small {
+ color: var(--color-text-secondary);
+}
+
+.birthday-preview {
+ width: 84px;
+ height: 84px;
+ margin: 0 auto var(--space-3);
+ border-radius: var(--radius-full);
+ overflow: hidden;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ background: color-mix(in srgb, var(--module-accent) 16%, white);
+}
+
+.birthday-preview__image {
+ width: 100%;
+ height: 100%;
+ object-fit: cover;
+}
+
+.birthday-preview__fallback {
+ color: var(--module-accent);
+ font-size: var(--text-xl);
+ font-weight: var(--font-weight-bold);
+}
+
+.birthday-modal__photo-actions {
+ margin-top: var(--space-2);
+}
+
+.birthday-modal__hint {
+ color: var(--color-text-secondary);
+ font-size: var(--text-sm);
+}
+
+@media (max-width: 960px) {
+ .birthdays-grid {
+ grid-template-columns: 1fr;
+ }
+ .birthdays-panel--upcoming {
+ position: static;
+ }
+}
+
+.contact-action-btn {
+ width: 36px;
+ height: 36px;
+ border-radius: var(--radius-full);
+ border: none;
+ background: var(--color-surface-2);
+ cursor: pointer;
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ color: var(--color-text-secondary);
+}
diff --git a/public/styles/dashboard.css b/public/styles/dashboard.css
index 086164f..e65356f 100644
--- a/public/styles/dashboard.css
+++ b/public/styles/dashboard.css
@@ -34,6 +34,121 @@
}
}
+.dashboard-hero {
+ display: grid;
+ gap: var(--space-4);
+ margin-bottom: var(--space-5);
+}
+
+@media (min-width: 1024px) {
+ .dashboard-hero {
+ grid-template-columns: minmax(0, 1.4fr) minmax(320px, 0.9fr);
+ align-items: stretch;
+ }
+}
+
+.dashboard-hero .widget-greeting {
+ box-shadow: var(--glass-shadow-md);
+ min-height: 100%;
+}
+
+.dashboard-hero__rail {
+ display: grid;
+ gap: var(--space-3);
+ grid-template-columns: repeat(2, minmax(0, 1fr));
+}
+
+@media (max-width: 767px) {
+ .dashboard-hero__rail {
+ grid-template-columns: 1fr;
+ }
+}
+
+.dashboard-metric {
+ display: flex;
+ align-items: center;
+ gap: var(--space-3);
+ width: 100%;
+ min-height: 96px;
+ padding: var(--space-4);
+ border-radius: var(--radius-md);
+ background: color-mix(in srgb, var(--color-surface) 92%, transparent);
+ border: 1px solid var(--glass-border-subtle);
+ box-shadow: var(--glass-shadow-sm);
+ text-align: left;
+ appearance: none;
+ color: inherit;
+ cursor: pointer;
+ transition: transform var(--transition-fast), box-shadow var(--transition-fast);
+}
+
+.dashboard-metric:hover {
+ transform: translateY(-2px);
+ box-shadow: var(--glass-shadow-md);
+}
+
+.dashboard-metric__icon {
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ width: 42px;
+ height: 42px;
+ border-radius: var(--radius-full);
+ background: color-mix(in srgb, var(--color-accent) 16%, transparent);
+ color: var(--color-accent);
+ flex-shrink: 0;
+}
+
+.dashboard-metric--warn .dashboard-metric__icon {
+ background: color-mix(in srgb, var(--color-warning) 18%, transparent);
+ color: var(--color-warning);
+}
+
+.dashboard-metric--calendar .dashboard-metric__icon {
+ background: color-mix(in srgb, var(--module-calendar) 18%, transparent);
+ color: var(--module-calendar);
+}
+
+.dashboard-metric--meals .dashboard-metric__icon {
+ background: color-mix(in srgb, var(--module-meals) 18%, transparent);
+ color: var(--module-meals);
+}
+
+.dashboard-metric--weather .dashboard-metric__icon {
+ background: color-mix(in srgb, var(--module-dashboard) 18%, transparent);
+ color: var(--module-dashboard);
+}
+
+.dashboard-metric__body {
+ display: flex;
+ flex-direction: column;
+ gap: 2px;
+ min-width: 0;
+}
+
+.dashboard-metric__title {
+ font-size: var(--text-xs);
+ color: var(--color-text-secondary);
+}
+
+.dashboard-metric__value {
+ font-size: var(--text-base);
+ font-weight: var(--font-weight-semibold);
+ color: var(--color-text-primary);
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+
+.dashboard-metric__hint {
+ font-size: var(--text-xs);
+ color: var(--color-text-tertiary);
+}
+
+.dashboard-metric--skeleton {
+ cursor: default;
+}
+
/* --------------------------------------------------------
* Widget-Grid
*
@@ -181,6 +296,8 @@
.widget--budget { --widget-accent: var(--module-budget); }
.widget--contacts { --widget-accent: var(--module-contacts); }
.widget--weather { --widget-accent: var(--module-dashboard); }
+.widget--birthdays { --widget-accent: var(--module-birthdays); }
+.widget--family { --widget-accent: var(--module-contacts); }
/* --------------------------------------------------------
* Basis-Widget (Card)
@@ -1315,3 +1432,1054 @@
.onboarding-overlay--out { animation: none; }
.onboarding-dot { transition: none; }
}
+
+/* --------------------------------------------------------
+ * Modern Dashboard Skin
+ * -------------------------------------------------------- */
+.dashboard {
+ position: relative;
+ isolation: isolate;
+ overflow: clip;
+}
+
+.dashboard::before,
+.dashboard::after {
+ content: '';
+ position: absolute;
+ inset: auto;
+ z-index: -1;
+ pointer-events: none;
+ filter: blur(28px);
+ opacity: 0.55;
+}
+
+.dashboard::before {
+ top: -80px;
+ right: -120px;
+ width: min(42vw, 520px);
+ height: min(42vw, 520px);
+ background: radial-gradient(circle, color-mix(in srgb, var(--module-dashboard) 22%, transparent) 0%, transparent 70%);
+}
+
+.dashboard::after {
+ left: -140px;
+ bottom: 8%;
+ width: min(36vw, 440px);
+ height: min(36vw, 440px);
+ background: radial-gradient(circle, color-mix(in srgb, var(--module-calendar) 18%, transparent) 0%, transparent 72%);
+}
+
+.dashboard-shell {
+ display: flex;
+ flex-direction: column;
+ gap: var(--space-6);
+}
+
+.dashboard-hero {
+ display: grid;
+ gap: var(--space-4);
+}
+
+@media (min-width: 1100px) {
+ .dashboard-hero {
+ grid-template-columns: minmax(0, 1.45fr) minmax(340px, 0.85fr);
+ }
+}
+
+.dashboard-hero__panel {
+ position: relative;
+ overflow: hidden;
+ border-radius: clamp(22px, 3vw, 34px);
+ padding: clamp(1.25rem, 2vw, 2rem);
+ border: 1px solid color-mix(in srgb, var(--color-border) 30%, transparent);
+ box-shadow: 0 18px 60px color-mix(in srgb, var(--color-shadow) 22%, transparent);
+ backdrop-filter: blur(18px);
+ -webkit-backdrop-filter: blur(18px);
+}
+
+.dashboard-hero__panel::before {
+ content: '';
+ position: absolute;
+ inset: 0;
+ background:
+ radial-gradient(circle at top right, color-mix(in srgb, var(--module-dashboard) 20%, transparent), transparent 42%),
+ radial-gradient(circle at bottom left, color-mix(in srgb, var(--module-calendar) 14%, transparent), transparent 38%);
+ opacity: 0.9;
+ pointer-events: none;
+}
+
+.dashboard-hero__panel > * {
+ position: relative;
+ z-index: 1;
+}
+
+.dashboard-hero__panel--intro {
+ background:
+ linear-gradient(135deg,
+ color-mix(in srgb, var(--module-dashboard) 20%, var(--color-surface)) 0%,
+ color-mix(in srgb, var(--module-calendar) 10%, var(--color-surface)) 48%,
+ color-mix(in srgb, var(--module-shopping) 8%, var(--color-surface)) 100%);
+}
+
+.dashboard-hero__panel--summary {
+ background:
+ linear-gradient(180deg,
+ color-mix(in srgb, var(--color-surface) 90%, transparent) 0%,
+ color-mix(in srgb, var(--color-surface-2) 78%, transparent) 100%);
+}
+
+.dashboard-hero__eyebrow {
+ display: inline-flex;
+ align-items: center;
+ gap: var(--space-1);
+ padding: var(--space-1) var(--space-2);
+ border-radius: var(--radius-full);
+ background: color-mix(in srgb, var(--color-accent) 14%, transparent);
+ color: var(--color-accent);
+ font-size: var(--text-xs);
+ font-weight: var(--font-weight-semibold);
+ letter-spacing: 0.08em;
+ text-transform: uppercase;
+}
+
+.dashboard-hero__title {
+ margin: var(--space-3) 0 0;
+ font-size: clamp(2.1rem, 4.5vw, 4.3rem);
+ line-height: 0.98;
+ letter-spacing: -0.04em;
+ font-weight: var(--font-weight-bold);
+ max-width: 14ch;
+}
+
+.dashboard-hero__subtitle {
+ margin: var(--space-3) 0 0;
+ color: var(--color-text-secondary);
+ font-size: var(--text-base);
+}
+
+.dashboard-hero__chips {
+ display: flex;
+ flex-wrap: wrap;
+ gap: var(--space-2);
+ margin-top: var(--space-4);
+}
+
+.dashboard-chip {
+ display: inline-flex;
+ align-items: center;
+ min-height: 32px;
+ padding: 0 var(--space-3);
+ border-radius: var(--radius-full);
+ background: color-mix(in srgb, var(--color-text-primary) 7%, transparent);
+ color: var(--color-text-primary);
+ font-size: var(--text-sm);
+ font-weight: var(--font-weight-medium);
+}
+
+.dashboard-chip--danger {
+ background: color-mix(in srgb, var(--color-danger) 16%, transparent);
+ color: var(--color-danger);
+}
+
+.dashboard-chip--warning {
+ background: color-mix(in srgb, var(--color-warning) 18%, transparent);
+ color: var(--color-warning);
+}
+
+.dashboard-chip--accent {
+ background: color-mix(in srgb, var(--module-dashboard) 16%, transparent);
+ color: var(--module-dashboard);
+}
+
+.dashboard-hero__actions {
+ display: flex;
+ flex-wrap: wrap;
+ gap: var(--space-2);
+ margin-top: var(--space-5);
+}
+
+.dashboard-action {
+ display: inline-flex;
+ align-items: center;
+ gap: var(--space-2);
+ min-height: 44px;
+ padding: 0 var(--space-3);
+ border-radius: var(--radius-full);
+ border: 1px solid color-mix(in srgb, var(--color-border) 40%, transparent);
+ background: color-mix(in srgb, var(--color-surface) 76%, transparent);
+ color: var(--color-text-primary);
+ box-shadow: var(--shadow-xs);
+ transition: transform var(--transition-fast), box-shadow var(--transition-fast), border-color var(--transition-fast);
+}
+
+.dashboard-action:hover {
+ transform: translateY(-1px);
+ box-shadow: var(--shadow-sm);
+ border-color: color-mix(in srgb, var(--color-accent) 30%, transparent);
+}
+
+.dashboard-action__icon {
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ width: 28px;
+ height: 28px;
+ border-radius: 999px;
+ background: color-mix(in srgb, var(--color-accent) 10%, transparent);
+ color: var(--color-accent);
+ flex-shrink: 0;
+}
+
+.dashboard-action--blue .dashboard-action__icon {
+ background: color-mix(in srgb, var(--module-tasks) 14%, transparent);
+ color: var(--module-tasks);
+}
+
+.dashboard-action--violet .dashboard-action__icon {
+ background: color-mix(in srgb, var(--module-calendar) 14%, transparent);
+ color: var(--module-calendar);
+}
+
+.dashboard-action--green .dashboard-action__icon {
+ background: color-mix(in srgb, var(--module-shopping) 14%, transparent);
+ color: var(--module-shopping);
+}
+
+.dashboard-action--amber .dashboard-action__icon {
+ background: color-mix(in srgb, var(--module-notes) 14%, transparent);
+ color: var(--module-notes);
+}
+
+.dashboard-action__label {
+ font-size: var(--text-sm);
+ font-weight: var(--font-weight-semibold);
+}
+
+.dashboard-hero__summary-head {
+ display: flex;
+ align-items: start;
+ justify-content: space-between;
+ gap: var(--space-3);
+}
+
+.dashboard-hero__summary-label {
+ font-size: var(--text-xs);
+ text-transform: uppercase;
+ letter-spacing: 0.08em;
+ color: var(--color-text-tertiary);
+}
+
+.dashboard-hero__summary-value {
+ margin-top: var(--space-1);
+ font-size: var(--text-lg);
+ font-weight: var(--font-weight-bold);
+ color: var(--color-text-primary);
+}
+
+.dashboard-hero__summary-grid {
+ display: grid;
+ gap: var(--space-3);
+ grid-template-columns: 1fr;
+ margin-top: var(--space-4);
+}
+
+@media (min-width: 680px) {
+ .dashboard-hero__summary-grid {
+ grid-template-columns: repeat(2, minmax(0, 1fr));
+ }
+}
+
+.dashboard-stat {
+ display: flex;
+ align-items: center;
+ gap: var(--space-3);
+ min-height: 88px;
+ padding: var(--space-3);
+ border-radius: 24px;
+ background: color-mix(in srgb, var(--color-surface) 88%, transparent);
+ border: 1px solid color-mix(in srgb, var(--color-border) 42%, transparent);
+ box-shadow: var(--shadow-xs);
+}
+
+.dashboard-stat__icon {
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ width: 42px;
+ height: 42px;
+ border-radius: 999px;
+ background: color-mix(in srgb, var(--color-accent) 14%, transparent);
+ color: var(--color-accent);
+ flex-shrink: 0;
+}
+
+.dashboard-stat--danger .dashboard-stat__icon {
+ background: color-mix(in srgb, var(--color-danger) 16%, transparent);
+ color: var(--color-danger);
+}
+
+.dashboard-stat--calendar .dashboard-stat__icon {
+ background: color-mix(in srgb, var(--module-calendar) 16%, transparent);
+ color: var(--module-calendar);
+}
+
+.dashboard-stat--meals .dashboard-stat__icon {
+ background: color-mix(in srgb, var(--module-meals) 16%, transparent);
+ color: var(--module-meals);
+}
+
+.dashboard-stat--weather .dashboard-stat__icon {
+ background: color-mix(in srgb, var(--module-dashboard) 16%, transparent);
+ color: var(--module-dashboard);
+}
+
+.dashboard-stat__text {
+ display: flex;
+ flex-direction: column;
+ gap: 2px;
+ min-width: 0;
+}
+
+.dashboard-stat__title {
+ font-size: var(--text-xs);
+ color: var(--color-text-tertiary);
+}
+
+.dashboard-stat__value {
+ font-size: var(--text-sm);
+ font-weight: var(--font-weight-semibold);
+ color: var(--color-text-primary);
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+
+.dashboard-stat--skeleton {
+ min-height: 88px;
+ background: linear-gradient(90deg,
+ color-mix(in srgb, var(--color-surface-2) 40%, transparent),
+ color-mix(in srgb, var(--color-surface) 88%, transparent),
+ color-mix(in srgb, var(--color-surface-2) 40%, transparent));
+ background-size: 200% 100%;
+ animation: dashboard-sheen 1.8s ease-in-out infinite;
+}
+
+.dashboard-layout {
+ display: grid;
+ gap: var(--space-5);
+}
+
+@media (min-width: 1100px) {
+ .dashboard-layout {
+ grid-template-columns: minmax(0, 1.5fr) minmax(320px, 0.92fr);
+ align-items: start;
+ }
+}
+
+.dashboard-layout__main,
+.dashboard-layout__side {
+ min-width: 0;
+}
+
+@media (min-width: 1100px) {
+ .dashboard-layout__side {
+ position: sticky;
+ top: calc(var(--space-4) + 72px);
+ align-self: start;
+ }
+}
+
+.dashboard-layout__grid {
+ display: grid;
+ gap: var(--space-4);
+ grid-template-columns: minmax(0, 1fr);
+}
+
+@media (min-width: 780px) {
+ .dashboard-layout__grid {
+ grid-template-columns: repeat(2, minmax(0, 1fr));
+ }
+}
+
+.dashboard-layout__stack {
+ display: grid;
+ gap: var(--space-4);
+}
+
+.dashboard-tile {
+ min-width: 0;
+}
+
+.dashboard-tile--wide {
+ grid-column: 1 / -1;
+}
+
+.dashboard .widget {
+ border-radius: 28px;
+ border: 1px solid color-mix(in srgb, var(--color-border) 42%, transparent);
+ background:
+ linear-gradient(180deg,
+ color-mix(in srgb, var(--color-surface) 96%, transparent) 0%,
+ color-mix(in srgb, var(--color-surface-2) 88%, transparent) 100%);
+ box-shadow: 0 16px 48px color-mix(in srgb, var(--color-shadow) 18%, transparent);
+}
+
+.dashboard .widget::before {
+ height: 4px;
+ background: linear-gradient(90deg, var(--widget-accent, var(--color-accent)), transparent 78%);
+ opacity: 1;
+}
+
+.dashboard .widget__header {
+ padding: var(--space-4) var(--space-4) var(--space-2);
+}
+
+.dashboard .widget__body,
+.dashboard .notes-grid-widget {
+ padding: 0 var(--space-4) var(--space-4);
+}
+
+.dashboard .widget__empty {
+ padding: 0 var(--space-4) var(--space-4);
+}
+
+.dashboard .task-item,
+.dashboard .event-item,
+.dashboard .meal-slot,
+.dashboard .shopping-widget-list,
+.dashboard .note-item {
+ border-radius: 20px;
+}
+
+.dashboard .task-item:hover,
+.dashboard .event-item:hover,
+.dashboard .meal-slot:hover,
+.dashboard .shopping-widget-list:hover,
+.dashboard .note-item:hover {
+ transform: translateY(-2px);
+}
+
+.dashboard .weather-widget {
+ border-radius: 28px;
+}
+
+.dashboard .weather-widget__inner {
+ padding: 0 var(--space-4) var(--space-4);
+}
+
+.dashboard .weather-widget__refresh {
+ top: var(--space-3);
+ right: var(--space-3);
+}
+
+@keyframes dashboard-sheen {
+ 0% { background-position: 200% 0; }
+ 100% { background-position: -200% 0; }
+}
+
+/* --------------------------------------------------------
+ * Admin Dashboard Layout
+ * -------------------------------------------------------- */
+.dashboard {
+ max-width: min(1680px, 100%);
+ overflow: visible;
+}
+
+.dashboard::before,
+.dashboard::after {
+ display: none;
+}
+
+.dashboard-shell {
+ gap: var(--space-5);
+}
+
+.dashboard-overview {
+ display: flex;
+ flex-direction: column;
+ gap: var(--space-4);
+ border-top: 3px solid var(--module-accent);
+ border-bottom: 1px solid var(--color-border);
+ background:
+ linear-gradient(180deg,
+ color-mix(in srgb, var(--color-surface) 96%, transparent),
+ color-mix(in srgb, var(--color-surface-2) 86%, transparent));
+ padding: var(--space-4);
+ box-shadow: var(--shadow-sm);
+}
+
+@media (min-width: 1024px) {
+ .dashboard-overview {
+ border: 1px solid var(--color-border);
+ border-top: 3px solid var(--module-accent);
+ border-radius: 8px;
+ padding: var(--space-5);
+ }
+}
+
+.dashboard-overview__header {
+ display: flex;
+ flex-direction: column;
+ gap: var(--space-3);
+}
+
+@media (min-width: 900px) {
+ .dashboard-overview__header {
+ flex-direction: row;
+ align-items: center;
+ justify-content: space-between;
+ }
+}
+
+.dashboard-overview__heading {
+ min-width: 0;
+}
+
+.dashboard-overview__date {
+ display: block;
+ color: var(--color-text-secondary);
+ font-size: var(--text-sm);
+ font-weight: var(--font-weight-medium);
+}
+
+.dashboard-overview__title {
+ margin: var(--space-1) 0 0;
+ color: var(--color-text-primary);
+ font-size: var(--text-2xl);
+ line-height: 1.2;
+ letter-spacing: 0;
+ font-weight: var(--font-weight-bold);
+ overflow-wrap: anywhere;
+}
+
+.dashboard-overview__tools {
+ display: flex;
+ align-items: center;
+ gap: var(--space-2);
+ min-width: 0;
+}
+
+.dashboard-overview__actions {
+ display: flex;
+ align-items: center;
+ gap: var(--space-2);
+ overflow-x: auto;
+ scrollbar-width: none;
+ min-width: 0;
+ padding-bottom: 1px;
+}
+
+.dashboard-overview__actions::-webkit-scrollbar {
+ display: none;
+}
+
+.dashboard-action {
+ min-height: 36px;
+ padding: 0 var(--space-2);
+ border-radius: 8px;
+ border: 1px solid var(--color-border);
+ background: var(--color-surface);
+ color: var(--color-text-primary);
+ box-shadow: none;
+ flex: 0 0 auto;
+}
+
+.dashboard-action:hover {
+ transform: none;
+ box-shadow: var(--shadow-xs);
+ border-color: color-mix(in srgb, var(--module-accent) 42%, var(--color-border));
+}
+
+.dashboard-action__icon {
+ width: 24px;
+ height: 24px;
+ border-radius: 6px;
+}
+
+.dashboard-action__icon svg {
+ width: 15px;
+ height: 15px;
+}
+
+.dashboard-action__label {
+ font-size: var(--text-sm);
+ white-space: nowrap;
+}
+
+.dashboard-icon-btn {
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ width: 36px;
+ height: 36px;
+ border-radius: 8px;
+ border: 1px solid var(--color-border);
+ background: var(--color-surface);
+ color: var(--color-text-secondary);
+ flex: 0 0 auto;
+ transition: color var(--transition-fast), border-color var(--transition-fast), background-color var(--transition-fast);
+}
+
+.dashboard-icon-btn:hover,
+.dashboard-icon-btn:focus-visible {
+ color: var(--color-text-primary);
+ border-color: color-mix(in srgb, var(--module-accent) 42%, var(--color-border));
+ background: var(--color-surface-hover);
+}
+
+.dashboard-icon-btn svg {
+ width: 18px;
+ height: 18px;
+}
+
+.dashboard-kpi-grid {
+ display: grid;
+ gap: var(--space-3);
+ grid-template-columns: repeat(auto-fit, minmax(min(100%, 210px), 1fr));
+}
+
+.dashboard-kpi {
+ display: grid;
+ grid-template-columns: 38px minmax(0, 1fr);
+ align-items: center;
+ gap: var(--space-3);
+ min-height: 92px;
+ padding: var(--space-3);
+ border: 1px solid var(--color-border);
+ border-radius: 8px;
+ background: var(--color-surface);
+ color: var(--color-text-primary);
+ text-align: left;
+ box-shadow: var(--shadow-xs);
+ min-width: 0;
+}
+
+.dashboard-kpi:hover {
+ border-color: color-mix(in srgb, var(--module-accent) 36%, var(--color-border));
+ background: var(--color-surface-hover);
+}
+
+.dashboard-kpi__icon {
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ width: 38px;
+ height: 38px;
+ border-radius: 8px;
+ background: color-mix(in srgb, var(--module-accent) 14%, transparent);
+ color: var(--module-accent);
+}
+
+.dashboard-kpi__icon svg {
+ width: 19px;
+ height: 19px;
+}
+
+.dashboard-kpi--danger .dashboard-kpi__icon {
+ background: color-mix(in srgb, var(--color-danger) 14%, transparent);
+ color: var(--color-danger);
+}
+
+.dashboard-kpi--calendar .dashboard-kpi__icon {
+ background: color-mix(in srgb, var(--module-calendar) 14%, transparent);
+ color: var(--module-calendar);
+}
+
+.dashboard-kpi--meals .dashboard-kpi__icon {
+ background: color-mix(in srgb, var(--module-meals) 14%, transparent);
+ color: var(--module-meals);
+}
+
+.dashboard-kpi--weather .dashboard-kpi__icon {
+ background: color-mix(in srgb, var(--module-dashboard) 14%, transparent);
+ color: var(--module-dashboard);
+}
+
+.dashboard-kpi--birthdays .dashboard-kpi__icon {
+ background: color-mix(in srgb, var(--module-birthdays) 14%, transparent);
+ color: var(--module-birthdays);
+}
+
+.dashboard-kpi--family .dashboard-kpi__icon {
+ background: color-mix(in srgb, var(--module-contacts) 14%, transparent);
+ color: var(--module-contacts);
+}
+
+.dashboard-kpi__body {
+ display: flex;
+ flex-direction: column;
+ min-width: 0;
+ gap: 2px;
+}
+
+.dashboard-kpi__label {
+ color: var(--color-text-secondary);
+ font-size: var(--text-xs);
+ font-weight: var(--font-weight-semibold);
+}
+
+.dashboard-kpi__value {
+ color: var(--color-text-primary);
+ font-size: var(--text-lg);
+ font-weight: var(--font-weight-bold);
+ line-height: 1.25;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+
+.dashboard-kpi__meta {
+ color: var(--color-text-tertiary);
+ font-size: var(--text-xs);
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+
+.dashboard-kpi--skeleton {
+ min-height: 92px;
+ background: linear-gradient(90deg, var(--color-surface-2), var(--color-surface), var(--color-surface-2));
+ background-size: 200% 100%;
+ animation: dashboard-sheen 1.6s ease-in-out infinite;
+}
+
+.dashboard-workspace {
+ display: grid;
+ gap: var(--space-4);
+ align-items: start;
+}
+
+@media (min-width: 1180px) {
+ .dashboard-workspace {
+ grid-template-columns: minmax(0, 1fr) minmax(320px, 380px);
+ }
+}
+
+.dashboard-workspace__main,
+.dashboard-workspace__side {
+ min-width: 0;
+}
+
+.dashboard-widget-grid {
+ display: grid;
+ grid-template-columns: minmax(0, 1fr);
+ gap: var(--space-4);
+ align-items: start;
+}
+
+@media (min-width: 820px) {
+ .dashboard-widget-grid {
+ grid-template-columns: repeat(2, minmax(0, 1fr));
+ }
+}
+
+.dashboard-side-stack {
+ display: grid;
+ gap: var(--space-4);
+ align-items: start;
+}
+
+.dashboard-tile {
+ min-width: 0;
+}
+
+@media (min-width: 820px) {
+ .dashboard-tile--wide {
+ grid-column: 1 / -1;
+ }
+}
+
+.dashboard .widget,
+.dashboard .widget-skeleton {
+ border-radius: 8px;
+ border: 1px solid var(--color-border);
+ background: var(--color-surface);
+ box-shadow: var(--shadow-sm);
+ min-width: 0;
+}
+
+.dashboard .widget::before {
+ height: 3px;
+ background: var(--widget-accent, var(--module-accent));
+ opacity: 1;
+}
+
+.dashboard .widget__header {
+ min-height: 54px;
+ padding: var(--space-3) var(--space-4);
+ border-bottom: 1px solid color-mix(in srgb, var(--color-border) 70%, transparent);
+}
+
+.dashboard .widget__title,
+.dashboard .widget__link {
+ min-width: 0;
+}
+
+.dashboard .widget__body,
+.dashboard .notes-grid-widget,
+.dashboard .weather-widget__inner {
+ padding: var(--space-3) var(--space-4) var(--space-4);
+}
+
+.dashboard .widget__empty {
+ padding: var(--space-4);
+}
+
+.dashboard .task-item,
+.dashboard .event-item,
+.dashboard .meal-slot,
+.dashboard .shopping-widget-list,
+.dashboard .note-item {
+ border-radius: 8px;
+}
+
+.dashboard .task-item:hover,
+.dashboard .event-item:hover,
+.dashboard .meal-slot:hover,
+.dashboard .shopping-widget-list:hover,
+.dashboard .note-item:hover {
+ transform: none;
+}
+
+.dashboard .weather-widget {
+ border-radius: 8px;
+}
+
+.dashboard .weather-widget__refresh {
+ top: var(--space-3);
+ right: var(--space-3);
+ width: 34px;
+ height: 34px;
+ border-radius: 8px;
+}
+
+.birthday-widget-item {
+ display: grid;
+ grid-template-columns: 40px minmax(0, 1fr) auto;
+ align-items: center;
+ gap: var(--space-3);
+ padding: var(--space-2);
+ border: 1px solid color-mix(in srgb, var(--color-border) 72%, transparent);
+ background: var(--color-surface-2);
+ cursor: pointer;
+}
+
+.birthday-widget-item + .birthday-widget-item {
+ margin-top: var(--space-2);
+}
+
+.birthday-widget-item__avatar {
+ width: 40px;
+ height: 40px;
+ border-radius: 8px;
+ overflow: hidden;
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ background: color-mix(in srgb, var(--module-birthdays) 14%, transparent);
+ color: var(--module-birthdays);
+ font-weight: var(--font-weight-bold);
+ font-size: var(--text-sm);
+}
+
+.birthday-widget-item__avatar img {
+ width: 100%;
+ height: 100%;
+ object-fit: cover;
+}
+
+.birthday-widget-item__body {
+ min-width: 0;
+}
+
+.birthday-widget-item__name {
+ color: var(--color-text-primary);
+ font-weight: var(--font-weight-semibold);
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+
+.birthday-widget-item__meta {
+ margin-top: 2px;
+ color: var(--color-text-secondary);
+ font-size: var(--text-xs);
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+
+.birthday-widget-item__age {
+ min-width: 34px;
+ text-align: center;
+ padding: var(--space-1) var(--space-2);
+ border-radius: 8px;
+ background: var(--color-surface);
+ border: 1px solid var(--color-border);
+ color: var(--color-text-primary);
+ font-size: var(--text-sm);
+ font-weight: var(--font-weight-bold);
+}
+
+.family-widget {
+ padding: var(--space-4);
+}
+
+.family-widget__count {
+ color: var(--color-text-primary);
+ font-size: var(--text-3xl);
+ line-height: 1;
+ font-weight: var(--font-weight-bold);
+}
+
+.family-widget__meta {
+ margin-top: var(--space-1);
+ color: var(--color-text-secondary);
+ font-size: var(--text-sm);
+}
+
+.family-widget__avatars {
+ display: flex;
+ align-items: center;
+ margin-top: var(--space-4);
+ padding-left: var(--space-1);
+}
+
+.family-widget-avatar {
+ width: 34px;
+ height: 34px;
+ border-radius: 8px;
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ color: white;
+ font-weight: var(--font-weight-bold);
+ font-size: var(--text-xs);
+ border: 2px solid var(--color-surface);
+ box-shadow: var(--shadow-xs);
+}
+
+.family-widget-avatar + .family-widget-avatar {
+ margin-left: -8px;
+}
+
+.budget-widget {
+ padding: var(--space-4);
+}
+
+.budget-widget__headline {
+ display: flex;
+ align-items: baseline;
+ justify-content: space-between;
+ gap: var(--space-3);
+ padding-bottom: var(--space-3);
+ border-bottom: 1px solid var(--color-border);
+}
+
+.budget-widget__headline span {
+ color: var(--color-text-secondary);
+ font-size: var(--text-sm);
+ font-weight: var(--font-weight-medium);
+}
+
+.budget-widget__balance {
+ color: var(--color-text-primary);
+ font-size: var(--text-xl);
+ white-space: nowrap;
+}
+
+.budget-widget__balance--positive {
+ color: var(--color-success);
+}
+
+.budget-widget__balance--negative {
+ color: var(--color-danger);
+}
+
+.budget-widget__grid {
+ display: grid;
+ grid-template-columns: repeat(2, minmax(0, 1fr));
+ gap: var(--space-2);
+ margin-top: var(--space-3);
+}
+
+.budget-widget-metric {
+ min-width: 0;
+ padding: var(--space-3);
+ border-radius: 8px;
+ border: 1px solid var(--color-border);
+ background: var(--color-surface-2);
+}
+
+.budget-widget-metric span {
+ display: block;
+ color: var(--color-text-secondary);
+ font-size: var(--text-xs);
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+
+.budget-widget-metric strong {
+ display: block;
+ margin-top: 2px;
+ color: var(--color-text-primary);
+ font-size: var(--text-sm);
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+
+.budget-widget-metric--income strong {
+ color: var(--color-success);
+}
+
+.budget-widget-metric--expense strong {
+ color: var(--color-danger);
+}
+
+.budget-widget__footer {
+ margin-top: var(--space-3);
+ padding: var(--space-2) var(--space-3);
+ border-radius: 8px;
+ background: color-mix(in srgb, var(--module-budget) 10%, transparent);
+ color: var(--color-text-secondary);
+ font-size: var(--text-xs);
+ line-height: 1.4;
+}
+
+@media (max-width: 520px) {
+ .dashboard {
+ padding-left: var(--space-3);
+ padding-right: var(--space-3);
+ }
+
+ .dashboard-overview {
+ margin-left: calc(var(--space-3) * -1);
+ margin-right: calc(var(--space-3) * -1);
+ border-left: 0;
+ border-right: 0;
+ }
+
+ .dashboard-overview__tools {
+ align-items: stretch;
+ }
+
+ .dashboard-overview__actions {
+ flex: 1;
+ }
+
+ .dashboard-action__label {
+ display: none;
+ }
+
+ .dashboard-action {
+ width: 38px;
+ justify-content: center;
+ padding: 0;
+ }
+
+ .dashboard-kpi {
+ min-height: 82px;
+ }
+}
diff --git a/public/styles/tokens.css b/public/styles/tokens.css
index 358d655..064848f 100644
--- a/public/styles/tokens.css
+++ b/public/styles/tokens.css
@@ -168,6 +168,8 @@
--module-notes: var(--_module-notes); /* Amber-700 - Notizen (6.3:1 auf weiß — WCAG AA) */
--_module-contacts: #0969DA;
--module-contacts: var(--_module-contacts); /* Kräftiges Blau - Kontakte */
+ --_module-birthdays: #E11D48;
+ --module-birthdays: var(--_module-birthdays); /* Rose - Geburtstage */
--_module-budget: #0F766E;
--module-budget: var(--_module-budget); /* Teal-700 - Finanzen, Stabilität */
--_module-settings: #6E7781;
@@ -527,6 +529,7 @@
--_module-shopping: #F472B6;
--_module-notes: #FCD34D;
--_module-contacts: #60A5FA;
+ --_module-birthdays: #FB7185;
--_module-budget: #2DD4BF;
--_module-settings: #94A3B8;
--_module-reminders: #22D3EE; /* Cyan-400 */
@@ -631,6 +634,7 @@
--_module-shopping: #F472B6; /* Pink-400 */
--_module-notes: #FCD34D;
--_module-contacts: #60A5FA;
+ --_module-birthdays: #FB7185;
--_module-budget: #2DD4BF; /* Teal-400 */
--_module-settings: #94A3B8;
--_module-reminders: #22D3EE; /* Cyan-400 */
diff --git a/public/sw-register.js b/public/sw-register.js
index 555823d..dab33ee 100644
--- a/public/sw-register.js
+++ b/public/sw-register.js
@@ -7,9 +7,11 @@
if ('serviceWorker' in navigator) {
window.addEventListener('load', () => {
- navigator.serviceWorker.register('/sw.js').catch((err) => {
- console.warn('[SW] Registrierung fehlgeschlagen:', err);
- });
+ navigator.serviceWorker.register('/sw.js', { updateViaCache: 'none' })
+ .then((registration) => registration.update())
+ .catch((err) => {
+ console.warn('[SW] Registrierung fehlgeschlagen:', err);
+ });
});
// SW-Update: Auf iOS-PWA fuehrt ein sofortiger Reload bei controllerchange
@@ -24,4 +26,15 @@ if ('serviceWorker' in navigator) {
// Auf iOS-Standalone verhindert das den "leere Seite"-Bug.
setTimeout(() => window.location.reload(), 200);
});
+
+ const refreshSw = () => {
+ navigator.serviceWorker.getRegistration()
+ .then((registration) => registration?.update())
+ .catch(() => {});
+ };
+
+ window.addEventListener('focus', refreshSw);
+ document.addEventListener('visibilitychange', () => {
+ if (document.visibilityState === 'visible') refreshSw();
+ });
}
diff --git a/public/sw.js b/public/sw.js
index 96ab73d..1124058 100644
--- a/public/sw.js
+++ b/public/sw.js
@@ -13,11 +13,12 @@
* → bypassCacheUntil (in-memory + Cache API für SW-Restart-Robustheit)
*/
-const SHELL_CACHE = 'oikos-shell-v52';
-const PAGES_CACHE = 'oikos-pages-v47';
-const ASSETS_CACHE = 'oikos-assets-v47';
+const SHELL_CACHE = 'oikos-shell-v56';
+const PAGES_CACHE = 'oikos-pages-v51';
+const LOCALES_CACHE = 'oikos-locales-v3';
+const ASSETS_CACHE = 'oikos-assets-v51';
const BYPASS_CACHE = 'oikos-bypass-flag';
-const ALL_CACHES = [SHELL_CACHE, PAGES_CACHE, ASSETS_CACHE];
+const ALL_CACHES = [SHELL_CACHE, PAGES_CACHE, LOCALES_CACHE, ASSETS_CACHE];
// App-Shell: sofort benötigt für ersten Render
const APP_SHELL = [
@@ -27,12 +28,6 @@ const APP_SHELL = [
'/router.js',
'/i18n.js',
'/rrule-ui.js',
- '/locales/de.json',
- '/locales/en.json',
- '/locales/ja.json',
- '/locales/ar.json',
- '/locales/hi.json',
- '/locales/pt.json',
'/reminders.js',
'/sw-register.js',
'/lucide.min.js',
@@ -50,6 +45,7 @@ const APP_SHELL = [
'/styles/calendar.css',
'/styles/notes.css',
'/styles/contacts.css',
+ '/styles/birthdays.css',
'/styles/budget.css',
'/styles/settings.css',
'/styles/recipes.css',
@@ -65,6 +61,24 @@ const APP_SHELL = [
'/icons/icon-maskable-512.png',
];
+const APP_LOCALES = [
+ '/locales/ar.json',
+ '/locales/de.json',
+ '/locales/el.json',
+ '/locales/en.json',
+ '/locales/es.json',
+ '/locales/fr.json',
+ '/locales/hi.json',
+ '/locales/it.json',
+ '/locales/ja.json',
+ '/locales/pt.json',
+ '/locales/ru.json',
+ '/locales/sv.json',
+ '/locales/tr.json',
+ '/locales/uk.json',
+ '/locales/zh.json',
+];
+
// Seiten-Module: lazy geladen, aber vorab gecacht für Offline
const PAGE_MODULES = [
'/pages/dashboard.js',
@@ -74,6 +88,7 @@ const PAGE_MODULES = [
'/pages/calendar.js',
'/pages/notes.js',
'/pages/contacts.js',
+ '/pages/birthdays.js',
'/pages/budget.js',
'/pages/settings.js',
'/pages/login.js',
@@ -112,10 +127,12 @@ const _bypassInit = (async () => {
self.addEventListener('install', (event) => {
const freshShell = APP_SHELL.map((url) => new Request(url, { cache: 'reload' }));
const freshModules = PAGE_MODULES.map((url) => new Request(url, { cache: 'reload' }));
+ const freshLocales = APP_LOCALES.map((url) => new Request(url, { cache: 'reload' }));
event.waitUntil(
Promise.all([
caches.open(SHELL_CACHE).then((c) => c.addAll(freshShell)),
caches.open(PAGES_CACHE).then((c) => c.addAll(freshModules)),
+ caches.open(LOCALES_CACHE).then((c) => c.addAll(freshLocales)),
]).then(() => self.skipWaiting())
);
});
@@ -205,12 +222,20 @@ function dispatchFetch(request, url) {
return networkFirst(request, SHELL_CACHE);
}
- if (isAsset(url.pathname) && url.origin === self.location.origin) {
- return cacheFirst(request, ASSETS_CACHE);
+ if (url.pathname.startsWith('/locales/')) {
+ return networkFirst(request, LOCALES_CACHE);
}
if (url.pathname.startsWith('/pages/')) {
- return cacheFirst(request, PAGES_CACHE);
+ return networkFirst(request, PAGES_CACHE);
+ }
+
+ if (url.origin === self.location.origin && isMutableAppResource(url.pathname)) {
+ return networkFirst(request, SHELL_CACHE);
+ }
+
+ if (isAsset(url.pathname) && url.origin === self.location.origin) {
+ return cacheFirst(request, ASSETS_CACHE);
}
return cacheFirst(request, SHELL_CACHE);
@@ -268,3 +293,10 @@ async function cacheFirst(request, cacheName) {
function isAsset(pathname) {
return /\.(png|jpg|jpeg|ico|svg|webp|woff2?|gif)$/i.test(pathname);
}
+
+function isMutableAppResource(pathname) {
+ return pathname === '/'
+ || pathname === '/index.html'
+ || pathname === '/manifest.json'
+ || /\.(css|js|json|html)$/i.test(pathname);
+}
diff --git a/server/db-schema-test.js b/server/db-schema-test.js
index 981dde1..ec9386e 100644
--- a/server/db-schema-test.js
+++ b/server/db-schema-test.js
@@ -116,6 +116,17 @@ const MIGRATIONS_SQL = {
created_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')),
updated_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%SZ', 'now'))
);
+ CREATE TABLE IF NOT EXISTS birthdays (
+ id INTEGER PRIMARY KEY AUTOINCREMENT,
+ name TEXT NOT NULL,
+ birth_date TEXT NOT NULL,
+ notes TEXT,
+ photo_data TEXT,
+ calendar_event_id INTEGER REFERENCES calendar_events(id) ON DELETE SET NULL,
+ created_by INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+ created_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')),
+ updated_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%SZ', 'now'))
+ );
CREATE TABLE IF NOT EXISTS budget_entries (
id INTEGER PRIMARY KEY AUTOINCREMENT,
title TEXT NOT NULL,
@@ -182,6 +193,9 @@ const MIGRATIONS_SQL = {
CREATE TRIGGER IF NOT EXISTS trg_contacts_updated_at
AFTER UPDATE ON contacts FOR EACH ROW
BEGIN UPDATE contacts SET updated_at = strftime('%Y-%m-%dT%H:%M:%SZ', 'now') WHERE id = OLD.id; END;
+ CREATE TRIGGER IF NOT EXISTS trg_birthdays_updated_at
+ AFTER UPDATE ON birthdays FOR EACH ROW
+ BEGIN UPDATE birthdays SET updated_at = strftime('%Y-%m-%dT%H:%M:%SZ', 'now') WHERE id = OLD.id; END;
CREATE TRIGGER IF NOT EXISTS trg_budget_entries_updated_at
AFTER UPDATE ON budget_entries FOR EACH ROW
BEGIN UPDATE budget_entries SET updated_at = strftime('%Y-%m-%dT%H:%M:%SZ', 'now') WHERE id = OLD.id; END;
@@ -196,6 +210,10 @@ const MIGRATIONS_SQL = {
CREATE INDEX IF NOT EXISTS idx_notes_pinned ON notes(pinned);
CREATE INDEX IF NOT EXISTS idx_budget_date ON budget_entries(date);
CREATE INDEX IF NOT EXISTS idx_budget_created_by ON budget_entries(created_by);
+ CREATE INDEX IF NOT EXISTS idx_birthdays_name ON birthdays(name);
+ CREATE INDEX IF NOT EXISTS idx_birthdays_birth_date ON birthdays(birth_date);
+ CREATE INDEX IF NOT EXISTS idx_birthdays_created_by ON birthdays(created_by);
+ CREATE INDEX IF NOT EXISTS idx_birthdays_calendar_ref ON birthdays(calendar_event_id);
CREATE INDEX IF NOT EXISTS idx_api_tokens_hash ON api_tokens(token_hash);
CREATE INDEX IF NOT EXISTS idx_api_tokens_created_by ON api_tokens(created_by);
`,
diff --git a/server/db.js b/server/db.js
index 57253e1..17a0295 100644
--- a/server/db.js
+++ b/server/db.js
@@ -691,6 +691,32 @@ const MIGRATIONS = [
CREATE INDEX IF NOT EXISTS idx_api_tokens_created_by ON api_tokens(created_by);
`,
},
+ {
+ version: 18,
+ description: 'Birthdays with calendar integration',
+ up: `
+ CREATE TABLE IF NOT EXISTS birthdays (
+ id INTEGER PRIMARY KEY AUTOINCREMENT,
+ name TEXT NOT NULL,
+ birth_date TEXT NOT NULL,
+ notes TEXT,
+ photo_data TEXT,
+ calendar_event_id INTEGER REFERENCES calendar_events(id) ON DELETE SET NULL,
+ created_by INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+ created_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')),
+ updated_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%SZ', 'now'))
+ );
+
+ CREATE TRIGGER IF NOT EXISTS trg_birthdays_updated_at
+ AFTER UPDATE ON birthdays FOR EACH ROW
+ BEGIN UPDATE birthdays SET updated_at = strftime('%Y-%m-%dT%H:%M:%SZ', 'now') WHERE id = OLD.id; END;
+
+ CREATE INDEX IF NOT EXISTS idx_birthdays_name ON birthdays(name);
+ CREATE INDEX IF NOT EXISTS idx_birthdays_birth_date ON birthdays(birth_date);
+ CREATE INDEX IF NOT EXISTS idx_birthdays_created_by ON birthdays(created_by);
+ CREATE INDEX IF NOT EXISTS idx_birthdays_calendar_ref ON birthdays(calendar_event_id);
+ `,
+ },
];
/**
diff --git a/server/index.js b/server/index.js
index d09af0e..be4759d 100644
--- a/server/index.js
+++ b/server/index.js
@@ -25,6 +25,7 @@ import recipesRouter from './routes/recipes.js';
import calendarRouter from './routes/calendar.js';
import notesRouter from './routes/notes.js';
import contactsRouter from './routes/contacts.js';
+import birthdaysRouter from './routes/birthdays.js';
import budgetRouter from './routes/budget.js';
import weatherRouter from './routes/weather.js';
import preferencesRouter from './routes/preferences.js';
@@ -38,6 +39,7 @@ const logOikos = createLogger('Oikos');
const { version: APP_VERSION } = JSON.parse(
readFileSync(new URL('../package.json', import.meta.url), 'utf-8')
);
+const DEFAULT_APP_NAME = 'Oikos';
const app = express();
const PORT = process.env.PORT || 3000;
@@ -164,7 +166,14 @@ app.use('/api/v1/auth', authRouter);
// Versionsinformation - keine Authentifizierung erforderlich (Login-Seite benötigt diese)
app.get('/api/v1/version', (req, res) => {
- res.json({ version: APP_VERSION });
+ let appName = DEFAULT_APP_NAME;
+ try {
+ const row = db.get().prepare('SELECT value FROM sync_config WHERE key = ?').get('app_name');
+ if (row?.value) appName = row.value;
+ } catch {
+ // fall back to default
+ }
+ res.json({ version: APP_VERSION, app_name: appName });
});
function sendOpenApi(req, res) {
@@ -188,6 +197,7 @@ app.use('/api/v1/recipes', recipesRouter);
app.use('/api/v1/calendar', calendarRouter);
app.use('/api/v1/notes', notesRouter);
app.use('/api/v1/contacts', contactsRouter);
+app.use('/api/v1/birthdays', birthdaysRouter);
app.use('/api/v1/budget', budgetRouter);
app.use('/api/v1/weather', weatherRouter);
app.use('/api/v1/preferences', preferencesRouter);
diff --git a/server/openapi.js b/server/openapi.js
index b9d8039..6d51f94 100644
--- a/server/openapi.js
+++ b/server/openapi.js
@@ -370,6 +370,20 @@ function buildPaths() {
delete: op({ summary: 'Delete contact', tag: 'Contacts', params: [idParam()], stateChanging: true }),
},
'/api/v1/contacts/{id}/vcard': { get: op({ summary: 'Download contact as vCard', tag: 'Contacts', params: [idParam()] }) },
+ '/api/v1/birthdays': {
+ get: op({ summary: 'List birthdays', tag: 'Birthdays' }),
+ post: op({ summary: 'Create birthday', tag: 'Birthdays', stateChanging: true, requestBody: jsonBody(null) }),
+ },
+ '/api/v1/birthdays/upcoming': {
+ get: op({ summary: 'List upcoming birthdays', tag: 'Birthdays' }),
+ },
+ '/api/v1/birthdays/meta/options': {
+ get: op({ summary: 'Get birthday upload options', tag: 'Birthdays' }),
+ },
+ '/api/v1/birthdays/{id}': {
+ put: op({ summary: 'Update birthday', tag: 'Birthdays', params: [idParam()], stateChanging: true, requestBody: jsonBody(null) }),
+ delete: op({ summary: 'Delete birthday', tag: 'Birthdays', params: [idParam()], stateChanging: true }),
+ },
'/api/v1/budget/summary': { get: op({ summary: 'Get budget summary', tag: 'Budget' }) },
'/api/v1/budget/export': { get: op({ summary: 'Export budget entries as CSV', tag: 'Budget' }) },
'/api/v1/budget/meta': { get: op({ summary: 'Get budget categories and subcategories', tag: 'Budget' }) },
@@ -437,6 +451,7 @@ function buildOpenApiSpec(req, appVersion) {
{ name: 'Calendar' },
{ name: 'Notes' },
{ name: 'Contacts' },
+ { name: 'Birthdays' },
{ name: 'Budget' },
{ name: 'Weather' },
{ name: 'Preferences' },
diff --git a/server/routes/birthdays.js b/server/routes/birthdays.js
new file mode 100644
index 0000000..91141da
--- /dev/null
+++ b/server/routes/birthdays.js
@@ -0,0 +1,159 @@
+import express from 'express';
+import { createLogger } from '../logger.js';
+import * as db from '../db.js';
+import { collectErrors, date as validateDate, str, MAX_SHORT, MAX_TEXT, MAX_TITLE } from '../middleware/validate.js';
+import { deleteBirthdayArtifacts, hydrateBirthday, syncBirthdayArtifacts, syncAllBirthdayReminders } from '../services/birthdays.js';
+
+const log = createLogger('Birthdays');
+const router = express.Router();
+const MAX_PHOTO_LENGTH = 900_000;
+const PHOTO_RE = /^data:image\/(png|jpeg|jpg|webp|gif);base64,[A-Za-z0-9+/=]+$/;
+
+function validatePhotoData(val) {
+ if (val === undefined) return { value: undefined, error: null };
+ if (val === null || val === '') return { value: null, error: null };
+ const s = String(val).trim();
+ if (s.length > MAX_PHOTO_LENGTH) return { value: null, error: 'Profile picture is too large.' };
+ if (!PHOTO_RE.test(s)) return { value: null, error: 'Profile picture must be a valid image data URL.' };
+ return { value: s, error: null };
+}
+
+function loadBirthday(id) {
+ return db.get().prepare('SELECT * FROM birthdays WHERE id = ?').get(id);
+}
+
+function loadBirthdayForUser(id, userId) {
+ return db.get().prepare('SELECT * FROM birthdays WHERE id = ? AND created_by = ?').get(id, userId);
+}
+
+function sortHydrated(rows) {
+ return rows
+ .map((row) => hydrateBirthday(row))
+ .sort((a, b) => a.days_until - b.days_until || a.name.localeCompare(b.name));
+}
+
+router.get('/', (req, res) => {
+ try {
+ const userId = req.authUserId || req.session.userId;
+ syncAllBirthdayReminders(db.get(), userId);
+
+ let sql = 'SELECT * FROM birthdays WHERE created_by = ?';
+ const params = [userId];
+
+ if (req.query.q) {
+ sql += ' AND name LIKE ?';
+ params.push(`%${String(req.query.q).trim()}%`);
+ }
+
+ sql += ' ORDER BY name COLLATE NOCASE ASC';
+
+ const rows = db.get().prepare(sql).all(...params);
+ res.json({ data: sortHydrated(rows) });
+ } catch (err) {
+ log.error('GET / error:', err);
+ res.status(500).json({ error: 'Internal error.', code: 500 });
+ }
+});
+
+router.get('/upcoming', (req, res) => {
+ try {
+ const userId = req.authUserId || req.session.userId;
+ syncAllBirthdayReminders(db.get(), userId);
+ const limit = Math.min(Math.max(parseInt(req.query.limit, 10) || 5, 1), 50);
+ const rows = db.get().prepare('SELECT * FROM birthdays WHERE created_by = ? ORDER BY name COLLATE NOCASE ASC').all(userId);
+ res.json({ data: sortHydrated(rows).slice(0, limit) });
+ } catch (err) {
+ log.error('GET /upcoming error:', err);
+ res.status(500).json({ error: 'Internal error.', code: 500 });
+ }
+});
+
+router.post('/', (req, res) => {
+ try {
+ const vName = str(req.body.name, 'Name', { max: MAX_TITLE });
+ const vBirthDate = validateDate(req.body.birth_date, 'Birth date', true);
+ const vNotes = str(req.body.notes, 'Notes', { max: MAX_TEXT, required: false });
+ const vPhoto = validatePhotoData(req.body.photo_data);
+ const errors = collectErrors([vName, vBirthDate, vNotes, vPhoto]);
+ if (errors.length) return res.status(400).json({ error: errors.join(' '), code: 400 });
+
+ const result = db.get().prepare(`
+ INSERT INTO birthdays (name, birth_date, notes, photo_data, created_by)
+ VALUES (?, ?, ?, ?, ?)
+ `).run(vName.value, vBirthDate.value, vNotes.value, vPhoto.value ?? null, req.authUserId || req.session.userId);
+
+ const birthday = loadBirthday(result.lastInsertRowid);
+ const synced = db.transaction(() => syncBirthdayArtifacts(db.get(), birthday));
+ res.status(201).json({ data: hydrateBirthday(loadBirthday(synced.id)) });
+ } catch (err) {
+ log.error('POST / error:', err);
+ res.status(500).json({ error: 'Internal error.', code: 500 });
+ }
+});
+
+router.put('/:id', (req, res) => {
+ try {
+ const userId = req.authUserId || req.session.userId;
+ const id = parseInt(req.params.id, 10);
+ const existing = loadBirthdayForUser(id, userId);
+ if (!existing) return res.status(404).json({ error: 'Birthday not found.', code: 404 });
+
+ const checks = [];
+ if (req.body.name !== undefined) checks.push(str(req.body.name, 'Name', { max: MAX_TITLE, required: false }));
+ if (req.body.birth_date !== undefined) checks.push(validateDate(req.body.birth_date, 'Birth date'));
+ if (req.body.notes !== undefined) checks.push(str(req.body.notes, 'Notes', { max: MAX_TEXT, required: false }));
+ if (req.body.photo_data !== undefined) checks.push(validatePhotoData(req.body.photo_data));
+ const errors = collectErrors(checks);
+ if (errors.length) return res.status(400).json({ error: errors.join(' '), code: 400 });
+
+ const vPhoto = req.body.photo_data !== undefined ? validatePhotoData(req.body.photo_data) : { value: undefined };
+
+ db.get().prepare(`
+ UPDATE birthdays
+ SET name = COALESCE(?, name),
+ birth_date = COALESCE(?, birth_date),
+ notes = ?,
+ photo_data = ?,
+ updated_at = strftime('%Y-%m-%dT%H:%M:%SZ', 'now')
+ WHERE id = ?
+ `).run(
+ req.body.name?.trim() ?? null,
+ req.body.birth_date ?? null,
+ req.body.notes !== undefined ? (req.body.notes?.trim() || null) : existing.notes,
+ req.body.photo_data !== undefined ? (vPhoto.value ?? null) : existing.photo_data,
+ id,
+ );
+
+ const updated = loadBirthday(id);
+ db.transaction(() => syncBirthdayArtifacts(db.get(), updated));
+ res.json({ data: hydrateBirthday(loadBirthday(id)) });
+ } catch (err) {
+ log.error('PUT /:id error:', err);
+ res.status(500).json({ error: 'Internal error.', code: 500 });
+ }
+});
+
+router.delete('/:id', (req, res) => {
+ try {
+ const userId = req.authUserId || req.session.userId;
+ const id = parseInt(req.params.id, 10);
+ const existing = loadBirthdayForUser(id, userId);
+ if (!existing) return res.status(404).json({ error: 'Birthday not found.', code: 404 });
+
+ db.transaction(() => {
+ deleteBirthdayArtifacts(db.get(), existing);
+ db.get().prepare('DELETE FROM birthdays WHERE id = ?').run(id);
+ });
+
+ res.status(204).end();
+ } catch (err) {
+ log.error('DELETE /:id error:', err);
+ res.status(500).json({ error: 'Internal error.', code: 500 });
+ }
+});
+
+router.get('/meta/options', (_req, res) => {
+ res.json({ data: { photoMaxBytes: MAX_PHOTO_LENGTH, acceptedImageTypes: ['image/png', 'image/jpeg', 'image/webp', 'image/gif'] } });
+});
+
+export default router;
diff --git a/server/routes/calendar.js b/server/routes/calendar.js
index 77a13bc..4b7e186 100644
--- a/server/routes/calendar.js
+++ b/server/routes/calendar.js
@@ -22,6 +22,19 @@ const router = express.Router();
const VALID_SOURCES = ['local', 'google', 'apple', 'ics'];
const ICS_COLOR_RE = /^#[0-9a-fA-F]{6}$/;
+function getUserId(req) {
+ const candidates = [req.authUserId, req.user?.id, req.session?.userId];
+ for (const value of candidates) {
+ const parsed = Number(value);
+ if (Number.isInteger(parsed) && parsed > 0) return parsed;
+ }
+ return null;
+}
+
+function isAdminUser(req) {
+ return req.authRole === 'admin' || req.session?.isAdmin === true || req.session?.role === 'admin';
+}
+
// --------------------------------------------------------
// RRULE-Expansion: alle Vorkommen eines wiederkehrenden Events
// innerhalb [from, to] generieren (inklusive beider Grenzen).
@@ -146,7 +159,7 @@ router.get('/', (req, res) => {
)
)
`;
- const params = [to, from, to, req.session.userId];
+ const params = [to, from, to, getUserId(req)];
if (req.query.assigned_to) {
sql += ' AND e.assigned_to = ?';
@@ -203,7 +216,7 @@ router.get('/upcoming', (req, res) => {
)
)
ORDER BY e.start_datetime ASC
- `).all(nowDate, future, future, req.session.userId);
+ `).all(nowDate, future, future, getUserId(req));
const expanded = expandRecurringEvents(rawEvents, nowDate, future)
.filter((e) => e.start_datetime >= new Date().toISOString())
@@ -396,7 +409,7 @@ router.delete('/apple/disconnect', requireAdmin, (req, res) => {
router.get('/subscriptions', (req, res) => {
try {
- const subs = icsSubscription.getAll(req.session.userId);
+ const subs = icsSubscription.getAll(getUserId(req));
res.json({ data: subs });
} catch (err) {
log.error('', err);
@@ -416,7 +429,7 @@ router.post('/subscriptions', async (req, res) => {
if (!colorVal || !ICS_COLOR_RE.test(colorVal))
return res.status(400).json({ error: 'color: Pflichtfeld, muss #RRGGBB sein.', code: 400 });
- const { sub, syncError } = await icsSubscription.create(req.session.userId, {
+ const { sub, syncError } = await icsSubscription.create(getUserId(req), {
name: name.trim(), url, color: colorVal, shared: shared ? 1 : 0,
});
res.status(201).json({ data: sub, syncError: syncError || null });
@@ -432,7 +445,7 @@ router.patch('/subscriptions/:id', (req, res) => {
try {
const subId = parseInt(req.params.id, 10);
if (!Number.isFinite(subId)) return res.status(400).json({ error: 'Ungültige ID.', code: 400 });
- const isAdmin = req.session.isAdmin;
+ const isAdmin = isAdminUser(req);
const fields = {};
if (req.body.name !== undefined) {
if (typeof req.body.name !== 'string' || req.body.name.trim().length === 0 || req.body.name.length > 100)
@@ -446,7 +459,7 @@ router.patch('/subscriptions/:id', (req, res) => {
}
if (req.body.shared !== undefined) fields.shared = req.body.shared;
- const updated = icsSubscription.update(req.session.userId, subId, fields, isAdmin);
+ const updated = icsSubscription.update(getUserId(req), subId, fields, isAdmin);
if (!updated) return res.status(404).json({ error: 'Abonnement nicht gefunden.', code: 404 });
res.json({ data: updated });
} catch (err) {
@@ -460,8 +473,8 @@ router.delete('/subscriptions/:id', (req, res) => {
try {
const subId = parseInt(req.params.id, 10);
if (!Number.isFinite(subId)) return res.status(400).json({ error: 'Ungültige ID.', code: 400 });
- const isAdmin = req.session.isAdmin;
- const ok = icsSubscription.remove(req.session.userId, subId, isAdmin);
+ const isAdmin = isAdminUser(req);
+ const ok = icsSubscription.remove(getUserId(req), subId, isAdmin);
if (!ok) return res.status(404).json({ error: 'Abonnement nicht gefunden.', code: 404 });
res.status(204).end();
} catch (err) {
@@ -475,10 +488,10 @@ router.post('/subscriptions/:id/sync', async (req, res) => {
try {
const subId = parseInt(req.params.id, 10);
if (!Number.isFinite(subId)) return res.status(400).json({ error: 'Ungültige ID.', code: 400 });
- const isAdmin = req.session.isAdmin;
+ const isAdmin = isAdminUser(req);
const sub = db.get().prepare('SELECT * FROM ics_subscriptions WHERE id = ?').get(subId);
if (!sub) return res.status(404).json({ error: 'Abonnement nicht gefunden.', code: 404 });
- if (!isAdmin && sub.created_by !== req.session.userId)
+ if (!isAdmin && sub.created_by !== getUserId(req))
return res.status(403).json({ error: 'Nicht autorisiert.', code: 403 });
await icsSubscription.sync(subId);
const updated = db.get().prepare('SELECT * FROM ics_subscriptions WHERE id = ?').get(subId);
@@ -526,6 +539,17 @@ router.get('/:id', (req, res) => {
// --------------------------------------------------------
router.post('/', (req, res) => {
try {
+ const userId = getUserId(req);
+ if (!userId) {
+ log.warn('Rejecting calendar create without resolved authenticated user id', {
+ authMethod: req.authMethod || null,
+ authUserId: req.authUserId || null,
+ reqUserId: req.user?.id || null,
+ sessionUserId: req.session?.userId || null,
+ });
+ return res.status(401).json({ error: 'Not authenticated.', code: 401 });
+ }
+
const vTitle = str(req.body.title, 'Titel', { max: MAX_TITLE });
const vDesc = str(req.body.description, 'Beschreibung', { max: MAX_TEXT, required: false });
const vStart = datetime(req.body.start_datetime, 'Startdatum', true);
@@ -553,7 +577,7 @@ router.post('/', (req, res) => {
vStart.value, vEnd.value,
all_day ? 1 : 0, vLoc.value,
vColor.value, assigned_to || null,
- req.session.userId, vRrule.value
+ userId, vRrule.value
);
const event = db.get().prepare(`
@@ -669,8 +693,8 @@ router.post('/:id/reset', (req, res) => {
if (event.external_source !== 'ics')
return res.status(400).json({ error: 'Nur ICS-Events können zurückgesetzt werden.', code: 400 });
- const userId = req.session.userId;
- const isAdmin = req.session.isAdmin;
+ const userId = getUserId(req);
+ const isAdmin = isAdminUser(req);
if (!isAdmin && event.created_by !== userId && event.sub_created_by !== userId)
return res.status(403).json({ error: 'Nicht autorisiert.', code: 403 });
diff --git a/server/routes/dashboard.js b/server/routes/dashboard.js
index 9bb2f32..4e85d39 100644
--- a/server/routes/dashboard.js
+++ b/server/routes/dashboard.js
@@ -7,6 +7,7 @@
import { createLogger } from '../logger.js';
import express from 'express';
import * as db from '../db.js';
+import { hydrateBirthday } from '../services/birthdays.js';
const log = createLogger('Dashboard');
@@ -30,10 +31,12 @@ router.get('/', (req, res) => {
try {
const d = db.get();
const result = {};
+ const userId = req.authUserId || req.session.userId;
// Heute und +48h als ISO-Strings
const now = new Date();
const todayStr = now.toISOString().slice(0, 10);
+ const currentMonth = todayStr.slice(0, 7);
const deadline48h = new Date(now.getTime() + 48 * 60 * 60 * 1000).toISOString();
// Anstehende Termine (nächste 5, ab jetzt)
@@ -170,6 +173,63 @@ router.get('/', (req, res) => {
result.users = [];
}
+ try {
+ const rows = d.prepare('SELECT * FROM birthdays WHERE created_by = ? ORDER BY name COLLATE NOCASE ASC').all(userId);
+ result.birthdays = rows
+ .map((row) => hydrateBirthday(row))
+ .sort((a, b) => a.days_until - b.days_until || a.name.localeCompare(b.name))
+ .slice(0, 3);
+ result.birthdayCount = rows.length;
+ } catch (err) {
+ log.error('birthdays error:', err.message);
+ result.birthdays = [];
+ result.birthdayCount = 0;
+ }
+
+ try {
+ const from = `${currentMonth}-01`;
+ const to = `${currentMonth}-31`;
+ const totals = d.prepare(`
+ SELECT
+ SUM(CASE WHEN amount > 0 THEN amount ELSE 0 END) AS income,
+ SUM(CASE WHEN amount < 0 THEN amount ELSE 0 END) AS expenses,
+ SUM(amount) AS balance,
+ COUNT(*) AS entry_count
+ FROM budget_entries
+ WHERE date BETWEEN ? AND ?
+ `).get(from, to);
+
+ const topExpense = d.prepare(`
+ SELECT category, SUM(amount) AS amount
+ FROM budget_entries
+ WHERE amount < 0 AND date BETWEEN ? AND ?
+ GROUP BY category
+ ORDER BY ABS(SUM(amount)) DESC
+ LIMIT 1
+ `).get(from, to);
+
+ result.budget = {
+ month: currentMonth,
+ income: totals?.income || 0,
+ expenses: Math.abs(totals?.expenses || 0),
+ balance: totals?.balance || 0,
+ entryCount: totals?.entry_count || 0,
+ topExpenseCategory: topExpense?.category || null,
+ topExpenseAmount: Math.abs(topExpense?.amount || 0),
+ };
+ } catch (err) {
+ log.error('budget error:', err.message);
+ result.budget = {
+ month: currentMonth,
+ income: 0,
+ expenses: 0,
+ balance: 0,
+ entryCount: 0,
+ topExpenseCategory: null,
+ topExpenseAmount: 0,
+ };
+ }
+
res.json(result);
} catch (err) {
log.error('Critical error:', err.message);
diff --git a/server/routes/preferences.js b/server/routes/preferences.js
index 0cd9c71..d02888d 100644
--- a/server/routes/preferences.js
+++ b/server/routes/preferences.js
@@ -7,6 +7,7 @@
import { createLogger } from '../logger.js';
import express from 'express';
import * as db from '../db.js';
+import { str, MAX_SHORT } from '../middleware/validate.js';
const log = createLogger('Preferences');
@@ -17,8 +18,12 @@ const DEFAULT_MEAL_TYPES = VALID_MEAL_TYPES.join(',');
const VALID_CURRENCIES = ['AED', 'AUD', 'BRL', 'CAD', 'CHF', 'CNY', 'CZK', 'DKK', 'EUR', 'GBP', 'HUF', 'INR', 'JPY', 'NOK', 'PLN', 'RUB', 'SAR', 'SEK', 'TRY', 'UAH', 'USD'];
const DEFAULT_CURRENCY = 'EUR';
+const DEFAULT_APP_NAME = 'Oikos';
-const VALID_WIDGET_IDS = ['weather', 'tasks', 'calendar', 'shopping', 'meals', 'notes'];
+const VALID_DATE_FORMATS = ['mdy', 'dmy', 'ymd'];
+const DEFAULT_DATE_FORMAT = 'mdy';
+
+const VALID_WIDGET_IDS = ['tasks', 'calendar', 'birthdays', 'budget', 'family', 'weather', 'shopping', 'meals', 'notes'];
const DEFAULT_WIDGET_CONFIG = JSON.stringify(VALID_WIDGET_IDS.map((id) => ({ id, visible: true })));
// --------------------------------------------------------
@@ -39,6 +44,10 @@ function cfgSet(key, value) {
`).run(key, value);
}
+function cfgDelete(key) {
+ db.get().prepare('DELETE FROM sync_config WHERE key = ?').run(key);
+}
+
// --------------------------------------------------------
// Widget-Hilfsfunktionen
// --------------------------------------------------------
@@ -78,12 +87,16 @@ router.get('/', (req, res) => {
const raw = cfgGet('visible_meal_types') ?? DEFAULT_MEAL_TYPES;
const visibleMealTypes = raw.split(',').filter((t) => VALID_MEAL_TYPES.includes(t));
const currency = cfgGet('currency') ?? DEFAULT_CURRENCY;
+ const dateFormat = VALID_DATE_FORMATS.includes(cfgGet('date_format')) ? cfgGet('date_format') : DEFAULT_DATE_FORMAT;
+ const appName = cfgGet('app_name') ?? DEFAULT_APP_NAME;
const dashboardWidgets = parseWidgetConfig(cfgGet('dashboard_widgets'));
res.json({
data: {
visible_meal_types: visibleMealTypes,
currency,
+ date_format: dateFormat,
+ app_name: appName,
dashboard_widgets: dashboardWidgets,
},
});
@@ -102,7 +115,7 @@ router.get('/', (req, res) => {
router.put('/', (req, res) => {
try {
- const { visible_meal_types, currency, dashboard_widgets } = req.body;
+ const { visible_meal_types, currency, date_format, app_name, dashboard_widgets } = req.body;
if (visible_meal_types !== undefined) {
if (!Array.isArray(visible_meal_types)) {
@@ -122,6 +135,20 @@ router.put('/', (req, res) => {
cfgSet('currency', currency);
}
+ if (date_format !== undefined) {
+ if (!VALID_DATE_FORMATS.includes(date_format)) {
+ return res.status(400).json({ error: `Ungültiges Datumsformat. Erlaubt: ${VALID_DATE_FORMATS.join(', ')}`, code: 400 });
+ }
+ cfgSet('date_format', date_format);
+ }
+
+ if (app_name !== undefined) {
+ const vAppName = str(app_name, 'Application name', { max: MAX_SHORT, required: false });
+ if (vAppName.error) return res.status(400).json({ error: vAppName.error, code: 400 });
+ if (vAppName.value) cfgSet('app_name', vAppName.value);
+ else cfgDelete('app_name');
+ }
+
if (dashboard_widgets !== undefined) {
if (!Array.isArray(dashboard_widgets)) {
return res.status(400).json({ error: 'dashboard_widgets muss ein Array sein', code: 400 });
@@ -133,12 +160,16 @@ router.put('/', (req, res) => {
const rawMealTypes = cfgGet('visible_meal_types') ?? DEFAULT_MEAL_TYPES;
const savedMealTypes = rawMealTypes.split(',').filter((t) => VALID_MEAL_TYPES.includes(t));
const savedCurrency = cfgGet('currency') ?? DEFAULT_CURRENCY;
+ const savedDateFormat = VALID_DATE_FORMATS.includes(cfgGet('date_format')) ? cfgGet('date_format') : DEFAULT_DATE_FORMAT;
+ const savedAppName = cfgGet('app_name') ?? DEFAULT_APP_NAME;
const savedWidgets = parseWidgetConfig(cfgGet('dashboard_widgets'));
res.json({
data: {
visible_meal_types: savedMealTypes,
currency: savedCurrency,
+ date_format: savedDateFormat,
+ app_name: savedAppName,
dashboard_widgets: savedWidgets,
},
});
diff --git a/server/routes/reminders.js b/server/routes/reminders.js
index e27c894..6462971 100644
--- a/server/routes/reminders.js
+++ b/server/routes/reminders.js
@@ -8,6 +8,7 @@ import { createLogger } from '../logger.js';
import express from 'express';
import * as db from '../db.js';
import * as v from '../middleware/validate.js';
+import { syncAllBirthdayReminders } from '../services/birthdays.js';
const log = createLogger('Reminders');
const router = express.Router();
@@ -22,8 +23,9 @@ const VALID_ENTITY_TYPES = ['task', 'event'];
// --------------------------------------------------------
router.get('/pending', (req, res) => {
try {
- const userId = req.session.userId;
+ const userId = req.authUserId || req.session.userId;
const now = new Date().toISOString();
+ syncAllBirthdayReminders(db.get(), userId, new Date());
const rows = db.get().prepare(`
SELECT
@@ -53,7 +55,7 @@ router.get('/pending', (req, res) => {
// --------------------------------------------------------
router.get('/', (req, res) => {
try {
- const userId = req.session.userId;
+ const userId = req.authUserId || req.session.userId;
const entityType = req.query.entity_type;
const entityId = parseInt(req.query.entity_id, 10);
@@ -82,7 +84,7 @@ router.get('/', (req, res) => {
// --------------------------------------------------------
router.post('/', (req, res) => {
try {
- const userId = req.session.userId;
+ const userId = req.authUserId || req.session.userId;
const { entity_type, entity_id, remind_at } = req.body;
const errors = v.collectErrors([
@@ -127,7 +129,7 @@ router.post('/', (req, res) => {
// --------------------------------------------------------
router.patch('/:id/dismiss', (req, res) => {
try {
- const userId = req.session.userId;
+ const userId = req.authUserId || req.session.userId;
const reminderId = parseInt(req.params.id, 10);
if (!reminderId) {
@@ -157,7 +159,7 @@ router.patch('/:id/dismiss', (req, res) => {
// --------------------------------------------------------
router.delete('/:id', (req, res) => {
try {
- const userId = req.session.userId;
+ const userId = req.authUserId || req.session.userId;
const reminderId = parseInt(req.params.id, 10);
if (!reminderId) {
@@ -187,7 +189,7 @@ router.delete('/:id', (req, res) => {
// --------------------------------------------------------
router.delete('/', (req, res) => {
try {
- const userId = req.session.userId;
+ const userId = req.authUserId || req.session.userId;
const entityType = req.query.entity_type;
const entityId = parseInt(req.query.entity_id, 10);
diff --git a/server/services/birthdays.js b/server/services/birthdays.js
new file mode 100644
index 0000000..b716da5
--- /dev/null
+++ b/server/services/birthdays.js
@@ -0,0 +1,201 @@
+const BIRTHDAY_COLOR = '#E11D48';
+const BIRTHDAY_RRULE = 'FREQ=YEARLY;INTERVAL=1';
+
+function pad2(n) {
+ return String(n).padStart(2, '0');
+}
+
+function leapYear(year) {
+ return year % 4 === 0 && (year % 100 !== 0 || year % 400 === 0);
+}
+
+function normalizedMonthDay(birthDate, year) {
+ const [, monthStr, dayStr] = String(birthDate).split('-');
+ const month = parseInt(monthStr, 10);
+ let day = parseInt(dayStr, 10);
+ if (month === 2 && day === 29 && !leapYear(year)) day = 28;
+ return `${year}-${pad2(month)}-${pad2(day)}`;
+}
+
+function nextBirthdayDate(birthDate, from = new Date()) {
+ const now = from instanceof Date ? from : new Date(from);
+ const thisYear = normalizedMonthDay(birthDate, now.getFullYear());
+ const today = now.toISOString().slice(0, 10);
+ return thisYear >= today
+ ? thisYear
+ : normalizedMonthDay(birthDate, now.getFullYear() + 1);
+}
+
+function nextBirthdayAge(birthDate, from = new Date()) {
+ const next = nextBirthdayDate(birthDate, from);
+ return parseInt(next.slice(0, 4), 10) - parseInt(String(birthDate).slice(0, 4), 10);
+}
+
+function daysUntilBirthday(birthDate, from = new Date()) {
+ const now = from instanceof Date ? from : new Date(from);
+ const next = nextBirthdayDate(birthDate, now);
+ const todayUtc = Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate());
+ const nextUtc = Date.UTC(
+ parseInt(next.slice(0, 4), 10),
+ parseInt(next.slice(5, 7), 10) - 1,
+ parseInt(next.slice(8, 10), 10),
+ );
+ return Math.round((nextUtc - todayUtc) / 86400000);
+}
+
+function birthdayReminderAt(birthDate, from = new Date()) {
+ const next = nextBirthdayDate(birthDate, from);
+ return `${next}T12:00:00Z`;
+}
+
+function eventTitle(name) {
+ return `Birthday: ${name}`;
+}
+
+function eventDescription(name, birthDate) {
+ return `Birthday reminder for ${name} (${birthDate}).`;
+}
+
+function syncBirthdayCalendarEvent(database, birthday) {
+ const payload = {
+ title: eventTitle(birthday.name),
+ description: eventDescription(birthday.name, birthday.birth_date),
+ start_datetime: birthday.birth_date,
+ end_datetime: null,
+ all_day: 1,
+ location: null,
+ color: BIRTHDAY_COLOR,
+ assigned_to: null,
+ recurrence_rule: BIRTHDAY_RRULE,
+ created_by: birthday.created_by,
+ };
+
+ if (birthday.calendar_event_id) {
+ const existing = database.prepare('SELECT id FROM calendar_events WHERE id = ?').get(birthday.calendar_event_id);
+ if (existing) {
+ database.prepare(`
+ UPDATE calendar_events
+ SET title = ?, description = ?, start_datetime = ?, end_datetime = ?, all_day = ?,
+ location = ?, color = ?, assigned_to = ?, recurrence_rule = ?, created_by = ?,
+ external_source = 'local'
+ WHERE id = ?
+ `).run(
+ payload.title,
+ payload.description,
+ payload.start_datetime,
+ payload.end_datetime,
+ payload.all_day,
+ payload.location,
+ payload.color,
+ payload.assigned_to,
+ payload.recurrence_rule,
+ payload.created_by,
+ birthday.calendar_event_id,
+ );
+ return birthday.calendar_event_id;
+ }
+ }
+
+ const result = database.prepare(`
+ INSERT INTO calendar_events
+ (title, description, start_datetime, end_datetime, all_day, location, color,
+ assigned_to, created_by, recurrence_rule, external_source)
+ VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 'local')
+ `).run(
+ payload.title,
+ payload.description,
+ payload.start_datetime,
+ payload.end_datetime,
+ payload.all_day,
+ payload.location,
+ payload.color,
+ payload.assigned_to,
+ payload.created_by,
+ payload.recurrence_rule,
+ );
+
+ database.prepare('UPDATE birthdays SET calendar_event_id = ? WHERE id = ?')
+ .run(result.lastInsertRowid, birthday.id);
+ return result.lastInsertRowid;
+}
+
+function syncBirthdayReminder(database, birthday, from = new Date()) {
+ if (!birthday.calendar_event_id) return null;
+
+ const desired = birthdayReminderAt(birthday.birth_date, from);
+ const existing = database.prepare(`
+ SELECT * FROM reminders
+ WHERE entity_type = 'event' AND entity_id = ? AND created_by = ?
+ ORDER BY created_at DESC
+ `).all(birthday.calendar_event_id, birthday.created_by);
+
+ const active = existing.find((row) => row.dismissed === 0);
+ if (active && active.remind_at === desired) return active.id;
+
+ database.prepare(`
+ DELETE FROM reminders
+ WHERE entity_type = 'event' AND entity_id = ? AND created_by = ?
+ `).run(birthday.calendar_event_id, birthday.created_by);
+
+ const result = database.prepare(`
+ INSERT INTO reminders (entity_type, entity_id, remind_at, created_by)
+ VALUES ('event', ?, ?, ?)
+ `).run(birthday.calendar_event_id, desired, birthday.created_by);
+
+ return result.lastInsertRowid;
+}
+
+function syncBirthdayArtifacts(database, birthday, from = new Date()) {
+ const calendarEventId = syncBirthdayCalendarEvent(database, birthday);
+ const refreshed = { ...birthday, calendar_event_id: calendarEventId };
+ syncBirthdayReminder(database, refreshed, from);
+ return refreshed;
+}
+
+function deleteBirthdayArtifacts(database, birthday) {
+ if (birthday.calendar_event_id) {
+ database.prepare(`
+ DELETE FROM reminders
+ WHERE entity_type = 'event' AND entity_id = ? AND created_by = ?
+ `).run(birthday.calendar_event_id, birthday.created_by);
+ database.prepare('DELETE FROM calendar_events WHERE id = ?').run(birthday.calendar_event_id);
+ }
+}
+
+function hydrateBirthday(row, from = new Date()) {
+ const next_birthday = nextBirthdayDate(row.birth_date, from);
+ return {
+ ...row,
+ next_birthday,
+ next_age: nextBirthdayAge(row.birth_date, from),
+ days_until: daysUntilBirthday(row.birth_date, from),
+ };
+}
+
+function syncAllBirthdayReminders(database, userId, from = new Date()) {
+ const birthdays = database.prepare(`
+ SELECT * FROM birthdays WHERE created_by = ? ORDER BY birth_date ASC
+ `).all(userId);
+ birthdays.forEach((birthday) => {
+ const refreshed = birthday.calendar_event_id ? birthday : {
+ ...birthday,
+ calendar_event_id: syncBirthdayCalendarEvent(database, birthday),
+ };
+ syncBirthdayReminder(database, refreshed, from);
+ });
+}
+
+export {
+ BIRTHDAY_COLOR,
+ BIRTHDAY_RRULE,
+ birthdayReminderAt,
+ daysUntilBirthday,
+ deleteBirthdayArtifacts,
+ eventDescription,
+ eventTitle,
+ hydrateBirthday,
+ nextBirthdayAge,
+ nextBirthdayDate,
+ syncAllBirthdayReminders,
+ syncBirthdayArtifacts,
+};
diff --git a/test-dashboard.js b/test-dashboard.js
index f028191..b7b2480 100644
--- a/test-dashboard.js
+++ b/test-dashboard.js
@@ -6,6 +6,7 @@
import { DatabaseSync } from 'node:sqlite';
import { MIGRATIONS_SQL } from './server/db-schema-test.js';
+import { hydrateBirthday } from './server/services/birthdays.js';
let passed = 0;
let failed = 0;
@@ -49,6 +50,7 @@ const uid2 = u2.lastInsertRowid;
const today = new Date().toISOString().slice(0, 10);
const tomorrow = new Date(Date.now() + 86400000).toISOString().slice(0, 10);
+const currentMonth = today.slice(0, 7);
const inOneHour = new Date(Date.now() + 3600000).toISOString();
const in30h = new Date(Date.now() + 30 * 3600000).toISOString().slice(0, 10);
const in72h = new Date(Date.now() + 72 * 3600000).toISOString().slice(0, 10);
@@ -83,6 +85,22 @@ db.prepare(`INSERT INTO notes (content, title, pinned, color, created_by)
db.prepare(`INSERT INTO notes (content, pinned, color, created_by)
VALUES ('Nicht angepinnt', 0, '#E3F2FF', ?)`).run(uid1);
+// Geburtstage
+db.prepare(`INSERT INTO birthdays (name, birth_date, created_by)
+ VALUES ('Heute Geburtstag', ?, ?)`).run(`2012-${today.slice(5)}`, uid1);
+db.prepare(`INSERT INTO birthdays (name, birth_date, created_by)
+ VALUES ('Morgen Geburtstag', ?, ?)`).run(`2010-${tomorrow.slice(5)}`, uid1);
+db.prepare(`INSERT INTO birthdays (name, birth_date, created_by)
+ VALUES ('Anderer Nutzer', ?, ?)`).run(`2011-${today.slice(5)}`, uid2);
+
+// Budget
+db.prepare(`INSERT INTO budget_entries (title, amount, category, subcategory, date, created_by)
+ VALUES ('Salary', 3000, 'Erwerbseinkommen', '', ?, ?)`).run(`${currentMonth}-05`, uid1);
+db.prepare(`INSERT INTO budget_entries (title, amount, category, subcategory, date, created_by)
+ VALUES ('Rent', -1200, 'housing', 'rent_mortgage', ?, ?)`).run(`${currentMonth}-06`, uid1);
+db.prepare(`INSERT INTO budget_entries (title, amount, category, subcategory, date, created_by)
+ VALUES ('Groceries', -450, 'food', 'supermarket', ?, ?)`).run(`${currentMonth}-07`, uid1);
+
console.log('\n[Dashboard-Test] API-Abfragen\n');
// --------------------------------------------------------
@@ -191,6 +209,53 @@ test('Angepinnte Notizen: nicht angepinnte werden ausgeschlossen', () => {
assert(!unpinned, 'Nicht angepinnte Notiz sollte gefiltert sein');
});
+// --------------------------------------------------------
+// Tests: Geburtstage
+// --------------------------------------------------------
+test('Geburtstage: nur aktueller Nutzer, sortiert nach nächstem Geburtstag', () => {
+ const rows = db.prepare('SELECT * FROM birthdays WHERE created_by = ? ORDER BY name COLLATE NOCASE ASC').all(uid1);
+ const birthdays = rows
+ .map((row) => hydrateBirthday(row, new Date(`${today}T12:00:00Z`)))
+ .sort((a, b) => a.days_until - b.days_until || a.name.localeCompare(b.name))
+ .slice(0, 3);
+
+ assert(rows.length === 2, `Erwartet 2 Geburtstage, erhalten ${rows.length}`);
+ assert(birthdays[0].name === 'Heute Geburtstag', 'Heutiger Geburtstag zuerst');
+ assert(birthdays[0].days_until === 0, 'Heutiger Geburtstag hat 0 Tage Rest');
+});
+
+// --------------------------------------------------------
+// Tests: Budget
+// --------------------------------------------------------
+test('Budget: Monatswerte für Einnahmen, Ausgaben, Saldo und Top-Ausgabe', () => {
+ const from = `${currentMonth}-01`;
+ const to = `${currentMonth}-31`;
+ const totals = db.prepare(`
+ SELECT
+ SUM(CASE WHEN amount > 0 THEN amount ELSE 0 END) AS income,
+ SUM(CASE WHEN amount < 0 THEN amount ELSE 0 END) AS expenses,
+ SUM(amount) AS balance,
+ COUNT(*) AS entry_count
+ FROM budget_entries
+ WHERE date BETWEEN ? AND ?
+ `).get(from, to);
+
+ const topExpense = db.prepare(`
+ SELECT category, SUM(amount) AS amount
+ FROM budget_entries
+ WHERE amount < 0 AND date BETWEEN ? AND ?
+ GROUP BY category
+ ORDER BY ABS(SUM(amount)) DESC
+ LIMIT 1
+ `).get(from, to);
+
+ assert(totals.income === 3000, `Einnahmen sollten 3000 sein, erhalten ${totals.income}`);
+ assert(Math.abs(totals.expenses) === 1650, `Ausgaben sollten 1650 sein, erhalten ${totals.expenses}`);
+ assert(totals.balance === 1350, `Saldo sollte 1350 sein, erhalten ${totals.balance}`);
+ assert(totals.entry_count === 3, `Erwartet 3 Einträge, erhalten ${totals.entry_count}`);
+ assert(topExpense.category === 'housing', 'Wohnen sollte Top-Ausgabenkategorie sein');
+});
+
// --------------------------------------------------------
// Ergebnis
// --------------------------------------------------------
diff --git a/test-db.js b/test-db.js
index 0ab8a51..6548729 100644
--- a/test-db.js
+++ b/test-db.js
@@ -73,7 +73,7 @@ test('Migration v1 ausführen (alle Tabellen und Triggers)', () => {
const EXPECTED_TABLES = [
'users', 'tasks', 'shopping_lists', 'shopping_items',
'meals', 'meal_ingredients', 'calendar_events',
- 'notes', 'contacts', 'budget_entries',
+ 'notes', 'contacts', 'birthdays', 'budget_entries',
'budget_categories', 'budget_subcategories', 'api_tokens',
];
@@ -99,6 +99,7 @@ const EXPECTED_TRIGGERS = [
'calendar_events',
'notes',
'contacts',
+ 'birthdays',
'budget_entries',
].map((t) => `trg_${t}_updated_at`);
@@ -200,6 +201,19 @@ test('API-Token anlegen und lesen', () => {
assert(token.revoked_at === null, 'Token sollte nicht widerrufen sein');
});
+test('Geburtstag mit Kalender-Referenz anlegen', () => {
+ const event = db.prepare(`
+ INSERT INTO calendar_events (title, start_datetime, all_day, created_by, recurrence_rule)
+ VALUES ('Birthday: Alex', '2014-05-10', 1, 1, 'FREQ=YEARLY;INTERVAL=1')
+ `).run();
+ const birthday = db.prepare(`
+ INSERT INTO birthdays (name, birth_date, calendar_event_id, created_by)
+ VALUES ('Alex', '2014-05-10', ?, 1)
+ `).run(event.lastInsertRowid);
+ const row = db.prepare('SELECT * FROM birthdays WHERE id = ?').get(birthday.lastInsertRowid);
+ assert(row.calendar_event_id === event.lastInsertRowid, 'Kalender-Referenz stimmt nicht');
+});
+
// --------------------------------------------------------
// Ergebnis
// --------------------------------------------------------