From 764c6b16fbddd313bd1f8a5401b832e0812ccf49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn-Michael=20Miehe?= Date: Tue, 12 Sep 2023 20:45:57 +0000 Subject: [PATCH] config.puzzle.title --- api/advent22_api/core/config.py | 3 +++ api/advent22_api/routers/admin.py | 2 ++ ui/src/components/ConfigView.vue | 4 ++-- ui/src/lib/api.ts | 1 + 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/api/advent22_api/core/config.py b/api/advent22_api/core/config.py index c99a017..97ccbf8 100644 --- a/api/advent22_api/core/config.py +++ b/api/advent22_api/core/config.py @@ -25,6 +25,9 @@ class Server(BaseModel): class Puzzle(BaseModel): + # Titel + title: str + # Lösungswort solution: str diff --git a/api/advent22_api/routers/admin.py b/api/advent22_api/routers/admin.py index e46ce7d..387a5b0 100644 --- a/api/advent22_api/routers/admin.py +++ b/api/advent22_api/routers/admin.py @@ -21,6 +21,7 @@ async def is_admin( class ConfigModel(BaseModel): class __Puzzle(BaseModel): + title: str solution: str begin: date end: date @@ -64,6 +65,7 @@ async def get_config_model( return ConfigModel.model_validate( { "puzzle": { + "title": cfg.puzzle.title, "solution": cfg.puzzle.solution, "begin": date.today(), # TODO "end": date.today(), # TODO diff --git a/ui/src/components/ConfigView.vue b/ui/src/components/ConfigView.vue index 6a1bb5f..eeb6e22 100644 --- a/ui/src/components/ConfigView.vue +++ b/ui/src/components/ConfigView.vue @@ -12,8 +12,7 @@

Rätsel

Titel
- -
Adventskalender 2023
+
{{ config_model.puzzle.title }}
Lösung
{{ config_model.puzzle.solution }}
@@ -137,6 +136,7 @@ export default class extends Vue { public is_loaded = false; public config_model: ConfigModel = { puzzle: { + title: "Advent22", solution: "ABCDEFGHIJKLMNOPQRSTUVWX", begin: "01.12.2023", end: "24.12.2023", diff --git a/ui/src/lib/api.ts b/ui/src/lib/api.ts index 2ce8b46..63717b2 100644 --- a/ui/src/lib/api.ts +++ b/ui/src/lib/api.ts @@ -1,5 +1,6 @@ export interface ConfigModel { puzzle: { + title: string; solution: string; begin: string; end: string;