8f9eafe561
Die bisherigen Stufen-Wähler ("Dunkel/Mittel/Hell/Maximum" und
"Kaum/Subtil/Normal/Stark") für Schrift- bzw. Linienkontrast sind durch
echte Hex-Color-Picker ersetzt. Zusätzlich kann jetzt auch die
Hintergrundfarbe der Seite frei gewählt werden.
Wenn ein Override gesetzt ist:
- text_color → setzt --text-1 direkt, --text-2/--text-3 werden
daraus per shadeHex(-0.25 / -0.55) abgeleitet, damit der Hue passt
- line_color → setzt --border, --border-light wird leicht abgedunkelt
- bg_color → setzt --bg-app, daraus werden Topbar/Sidebar/Surface/
Hover/Active per shadeHex(+0.10…+0.40) konsistent hochskaliert
Per "Reset"-Knopf wird der Override geleert und die alte Stufen-Logik
(falls noch vorhanden) bzw. der Default-Theme greift wieder.
Backend:
- 3 neue nullable VARCHAR(7)-Spalten in user_settings (text_color,
line_color, bg_color) inkl. Migrationen in main.py
- settings_router nutzt model_dump(exclude_unset=True) und respektiert
explizite null-Werte nur für diese 3 Override-Felder, damit Reset
funktioniert
Auch enthalten: Auflösen der Merge-Konflikte in sw.js, index.html,
version.js (HEAD-Stand v17 behalten) und Bump auf v18.
222 lines
8.6 KiB
Python
222 lines
8.6 KiB
Python
from sqlalchemy import Column, Integer, String, Boolean, DateTime, ForeignKey, Text
|
|
from sqlalchemy.orm import relationship
|
|
from database import Base
|
|
|
|
|
|
class User(Base):
|
|
__tablename__ = "users"
|
|
|
|
id = Column(Integer, primary_key=True, index=True)
|
|
username = Column(String(50), unique=True, nullable=False)
|
|
email = Column(String(100), unique=True, nullable=True)
|
|
password_hash = Column(String(255), nullable=False)
|
|
is_admin = Column(Boolean, default=False)
|
|
avatar_filename = Column(String(255), nullable=True)
|
|
totp_secret = Column(String(32), nullable=True)
|
|
totp_enabled = Column(Boolean, default=False)
|
|
|
|
caldav_accounts = relationship(
|
|
"CalDAVAccount", back_populates="user", cascade="all, delete-orphan"
|
|
)
|
|
settings = relationship(
|
|
"UserSettings", back_populates="user", uselist=False, cascade="all, delete-orphan"
|
|
)
|
|
local_calendars = relationship(
|
|
"LocalCalendar", back_populates="user", cascade="all, delete-orphan"
|
|
)
|
|
ical_subscriptions = relationship(
|
|
"ICalSubscription", back_populates="user", cascade="all, delete-orphan"
|
|
)
|
|
google_accounts = relationship(
|
|
"GoogleAccount", back_populates="user", cascade="all, delete-orphan"
|
|
)
|
|
homeassistant_accounts = relationship(
|
|
"HomeAssistantAccount", back_populates="user", cascade="all, delete-orphan"
|
|
)
|
|
|
|
|
|
class CalDAVAccount(Base):
|
|
__tablename__ = "caldav_accounts"
|
|
|
|
id = Column(Integer, primary_key=True, index=True)
|
|
user_id = Column(Integer, ForeignKey("users.id"), nullable=False)
|
|
name = Column(String(100), nullable=False)
|
|
url = Column(String(500), nullable=False)
|
|
username = Column(String(100), nullable=False)
|
|
password = Column(String(255), nullable=False)
|
|
color = Column(String(7), default="#4285f4")
|
|
enabled = Column(Boolean, default=True)
|
|
|
|
user = relationship("User", back_populates="caldav_accounts")
|
|
calendars = relationship(
|
|
"Calendar", back_populates="account", cascade="all, delete-orphan"
|
|
)
|
|
|
|
|
|
class Calendar(Base):
|
|
__tablename__ = "calendars"
|
|
|
|
id = Column(Integer, primary_key=True, index=True)
|
|
account_id = Column(Integer, ForeignKey("caldav_accounts.id"), nullable=False)
|
|
cal_id = Column(String(500), nullable=False)
|
|
name = Column(String(100), nullable=False)
|
|
color = Column(String(7), nullable=True)
|
|
enabled = Column(Boolean, default=True)
|
|
sidebar_hidden = Column(Boolean, default=False)
|
|
|
|
account = relationship("CalDAVAccount", back_populates="calendars")
|
|
|
|
|
|
class UserSettings(Base):
|
|
__tablename__ = "user_settings"
|
|
|
|
id = Column(Integer, primary_key=True, index=True)
|
|
user_id = Column(Integer, ForeignKey("users.id"), unique=True, nullable=False)
|
|
default_view = Column(String(20), default="month")
|
|
week_start_day = Column(String(10), default="monday")
|
|
primary_color = Column(String(7), default="#4285f4")
|
|
accent_color = Column(String(7), default="#ea4335")
|
|
today_color = Column(String(7), default="#4285f4")
|
|
dim_past_events = Column(Boolean, default=False)
|
|
text_contrast = Column(Integer, default=3)
|
|
line_contrast = Column(Integer, default=3)
|
|
hour_height = Column(Integer, default=60)
|
|
language = Column(String(5), default="de")
|
|
month_divider_color = Column(String(7), default="#7090c0")
|
|
month_label_color = Column(String(7), default="#7090c0")
|
|
text_color = Column(String(7), nullable=True) # Override für --text-1 (NULL = nutze text_contrast)
|
|
line_color = Column(String(7), nullable=True) # Override für --border (NULL = nutze line_contrast)
|
|
bg_color = Column(String(7), nullable=True) # Override für --bg-app (NULL = Default)
|
|
|
|
user = relationship("User", back_populates="settings")
|
|
|
|
|
|
class LocalCalendar(Base):
|
|
__tablename__ = "local_calendars"
|
|
|
|
id = Column(Integer, primary_key=True, index=True)
|
|
user_id = Column(Integer, ForeignKey("users.id"), nullable=False)
|
|
name = Column(String(100), nullable=False)
|
|
color = Column(String(7), default="#34a853")
|
|
enabled = Column(Boolean, default=True)
|
|
|
|
user = relationship("User", back_populates="local_calendars")
|
|
events = relationship("LocalEvent", back_populates="calendar", cascade="all, delete-orphan")
|
|
|
|
|
|
class LocalEvent(Base):
|
|
__tablename__ = "local_events"
|
|
|
|
id = Column(Integer, primary_key=True, index=True)
|
|
calendar_id = Column(Integer, ForeignKey("local_calendars.id"), nullable=False)
|
|
uid = Column(String(255), nullable=False, unique=True)
|
|
title = Column(String(255), nullable=False)
|
|
start = Column(String(50), nullable=False)
|
|
end = Column(String(50), nullable=False)
|
|
all_day = Column(Boolean, default=False)
|
|
location = Column(String(500), nullable=True)
|
|
description = Column(Text, nullable=True)
|
|
color = Column(String(7), nullable=True)
|
|
rrule = Column(Text, nullable=True)
|
|
exdate = Column(Text, nullable=True) # Comma-separated YYYYMMDD dates to exclude
|
|
|
|
calendar = relationship("LocalCalendar", back_populates="events")
|
|
|
|
|
|
class ICalSubscription(Base):
|
|
__tablename__ = "ical_subscriptions"
|
|
|
|
id = Column(Integer, primary_key=True, index=True)
|
|
user_id = Column(Integer, ForeignKey("users.id"), nullable=False)
|
|
name = Column(String(100), nullable=False)
|
|
url = Column(String(1000), nullable=False)
|
|
color = Column(String(7), default="#46bdc6")
|
|
enabled = Column(Boolean, default=True)
|
|
refresh_minutes = Column(Integer, default=60)
|
|
last_fetched = Column(DateTime, nullable=True)
|
|
cached_ics = Column(Text, nullable=True)
|
|
|
|
user = relationship("User", back_populates="ical_subscriptions")
|
|
overrides = relationship("ICalOverride", back_populates="subscription", cascade="all, delete-orphan")
|
|
|
|
|
|
class ICalOverride(Base):
|
|
__tablename__ = "ical_overrides"
|
|
|
|
id = Column(Integer, primary_key=True, index=True)
|
|
subscription_id = Column(Integer, ForeignKey("ical_subscriptions.id"), nullable=False)
|
|
event_uid = Column(String(500), nullable=False)
|
|
hidden = Column(Boolean, default=False)
|
|
title = Column(String(255), nullable=True)
|
|
start = Column(String(50), nullable=True)
|
|
end = Column(String(50), nullable=True)
|
|
all_day = Column(Boolean, nullable=True)
|
|
location = Column(String(500), nullable=True)
|
|
description = Column(Text, nullable=True)
|
|
color = Column(String(7), nullable=True)
|
|
|
|
subscription = relationship("ICalSubscription", back_populates="overrides")
|
|
|
|
|
|
class GoogleAccount(Base):
|
|
__tablename__ = "google_accounts"
|
|
|
|
id = Column(Integer, primary_key=True, index=True)
|
|
user_id = Column(Integer, ForeignKey("users.id"), nullable=False)
|
|
email = Column(String(255), nullable=False)
|
|
access_token = Column(Text, nullable=False)
|
|
refresh_token = Column(Text, nullable=False)
|
|
token_expiry = Column(DateTime, nullable=True)
|
|
|
|
user = relationship("User", back_populates="google_accounts")
|
|
calendars = relationship(
|
|
"GoogleCalendar", back_populates="account", cascade="all, delete-orphan"
|
|
)
|
|
|
|
|
|
class GoogleCalendar(Base):
|
|
__tablename__ = "google_calendars"
|
|
|
|
id = Column(Integer, primary_key=True, index=True)
|
|
account_id = Column(Integer, ForeignKey("google_accounts.id"), nullable=False)
|
|
cal_id = Column(String(500), nullable=False)
|
|
name = Column(String(255), nullable=False)
|
|
color = Column(String(7), nullable=True)
|
|
enabled = Column(Boolean, default=True)
|
|
sidebar_hidden = Column(Boolean, default=False)
|
|
|
|
account = relationship("GoogleAccount", back_populates="calendars")
|
|
|
|
|
|
class HomeAssistantAccount(Base):
|
|
__tablename__ = "homeassistant_accounts"
|
|
|
|
id = Column(Integer, primary_key=True, index=True)
|
|
user_id = Column(Integer, ForeignKey("users.id"), nullable=False)
|
|
name = Column(String(100), nullable=False)
|
|
url = Column(String(500), nullable=False)
|
|
token = Column(Text, nullable=False)
|
|
auth_method = Column(String(20), default="token")
|
|
refresh_token = Column(Text, nullable=True)
|
|
token_expiry = Column(DateTime, nullable=True)
|
|
client_id = Column(String(500), nullable=True)
|
|
|
|
user = relationship("User", back_populates="homeassistant_accounts")
|
|
calendars = relationship(
|
|
"HomeAssistantCalendar", back_populates="account", cascade="all, delete-orphan"
|
|
)
|
|
|
|
|
|
class HomeAssistantCalendar(Base):
|
|
__tablename__ = "homeassistant_calendars"
|
|
|
|
id = Column(Integer, primary_key=True, index=True)
|
|
account_id = Column(Integer, ForeignKey("homeassistant_accounts.id"), nullable=False)
|
|
entity_id = Column(String(255), nullable=False)
|
|
name = Column(String(255), nullable=False)
|
|
color = Column(String(7), nullable=True)
|
|
enabled = Column(Boolean, default=True)
|
|
sidebar_hidden = Column(Boolean, default=False)
|
|
|
|
account = relationship("HomeAssistantAccount", back_populates="calendars")
|