diff --git a/api/advent22_api/routers/admin.py b/api/advent22_api/routers/admin.py index 31fb3da..e1b6496 100644 --- a/api/advent22_api/routers/admin.py +++ b/api/advent22_api/routers/admin.py @@ -27,7 +27,7 @@ async def is_admin( return is_admin -class ConfigModel(BaseModel): +class AdminConfigModel(BaseModel): class __Solution(BaseModel): value: str whitespace: str @@ -71,12 +71,12 @@ async def get_config_model( cal_cfg: CalendarConfig = Depends(get_calendar_config), event_dates: EventDates = Depends(get_all_event_dates), ttfonts: list[TTFont] = Depends(get_all_ttfonts), -) -> ConfigModel: +) -> AdminConfigModel: """ Kombiniert aus privaten `settings`, `config` und `calendar_config` """ - return ConfigModel.model_validate( + return AdminConfigModel.model_validate( { "solution": { "value": cfg.solution.value, diff --git a/ui/src/components/admin/ConfigView.vue b/ui/src/components/admin/ConfigView.vue index 4468da2..38fc329 100644 --- a/ui/src/components/admin/ConfigView.vue +++ b/ui/src/components/admin/ConfigView.vue @@ -10,13 +10,13 @@
Eingabe: - "{{ config_model.solution.value }}" + "{{ admin_config_model.solution.value }}"
Ausgabe: - "{{ config_model.solution.clean }}" + "{{ admin_config_model.solution.clean }}"
@@ -24,13 +24,13 @@
Whitespace: - {{ config_model.solution.whitespace }} + {{ admin_config_model.solution.whitespace }}
Buchstaben: - {{ config_model.solution.case }} + {{ admin_config_model.solution.case }}
@@ -64,7 +64,7 @@
Zufalls-Seed
- "{{ config_model.puzzle.seed }}" + "{{ admin_config_model.puzzle.seed }}"
@@ -74,10 +74,10 @@

Kalender

Definition
-
{{ config_model.calendar.config_file }}
+
{{ admin_config_model.calendar.config_file }}
Hintergrundbild
-
{{ config_model.calendar.background }}
+
{{ admin_config_model.calendar.background }}
Favicon
{{ admin_config_model.calendar.favicon }}
@@ -96,14 +96,14 @@

Bilder

Größe
-
{{ config_model.image.size }} px
+
{{ admin_config_model.image.size }} px
Rand
-
{{ config_model.image.border }} px
+
{{ admin_config_model.image.border }} px
Schriftarten
{{ font.file }} ({{ font.size }} pt) @@ -116,7 +116,7 @@

WebDAV

URL
-
{{ config_model.webdav.url }}
+
{{ admin_config_model.webdav.url }}
Zugangsdaten
@@ -130,10 +130,10 @@
Cache-Dauer
-
{{ config_model.webdav.cache_ttl }} s
+
{{ admin_config_model.webdav.cache_ttl }} s
Konfigurationsdatei
-
{{ config_model.webdav.config_file }}
+
{{ admin_config_model.webdav.config_file }}
@@ -141,10 +141,10 @@

Sonstige

Redis
-
Host: {{ config_model.redis.host }}
-
Port: {{ config_model.redis.port }}
-
Datenbank: {{ config_model.redis.db }}
-
Protokoll: {{ config_model.redis.protocol }}
+
Host: {{ admin_config_model.redis.host }}
+
Port: {{ admin_config_model.redis.port }}
+
Datenbank: {{ admin_config_model.redis.db }}
+
Protokoll: {{ admin_config_model.redis.protocol }}
UI-Admin
@@ -165,7 +165,7 @@