From 96b27cf4df409629ee0d451fde7cf72b7bf6c232 Mon Sep 17 00:00:00 2001 From: David Rodenkirchen Date: Sun, 2 Jun 2024 17:16:32 +0200 Subject: [PATCH 1/2] update to rio 0.8.7 --- requirements.txt | Bin 68 -> 68 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/requirements.txt b/requirements.txt index 38591f48a5b8207641e5288c249c47a8c65afe68..74e4da4226d70d0c4e4dc757111f514da61f6edd 100644 GIT binary patch delta 9 QcmZ>9nIOezK2cf|01ONQKmY&$ delta 9 QcmZ>9nIOezGErI+01N;EJpcdz From e31a5464af48d9308f0f7c51fc654b896b26f0f7 Mon Sep 17 00:00:00 2001 From: David Rodenkirchen Date: Sun, 2 Jun 2024 17:17:53 +0200 Subject: [PATCH 2/2] refactor DI to attachements --- ezgg_website/__init__.py | 7 ++++--- ezgg_website/pages/member.py | 4 ++-- ezgg_website/pages/pics.py | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ezgg_website/__init__.py b/ezgg_website/__init__.py index 7cc804b..7d95fc6 100644 --- a/ezgg_website/__init__.py +++ b/ezgg_website/__init__.py @@ -126,7 +126,7 @@ app = rio.App( rio.Page( name="Member", page_url='member', - build=lambda: pages.Member(database_service), + build=pages.Member, ), rio.Page( name="Constitution", @@ -141,7 +141,7 @@ app = rio.App( rio.Page( name="Pics", page_url='pics', - build=lambda: pages.Pics(database_service), + build=pages.Pics, ), rio.Page( name="Imprint", @@ -157,5 +157,6 @@ app = rio.App( theme=themes[6], icon=from_root("ezgg_website/assets/icons/favicon.png"), assets_dir=Path(__file__).parent / "assets", - on_session_start=on_session_start + on_session_start=on_session_start, + default_attachments=[database_service] ) diff --git a/ezgg_website/pages/member.py b/ezgg_website/pages/member.py index 2e12db2..bec0012 100644 --- a/ezgg_website/pages/member.py +++ b/ezgg_website/pages/member.py @@ -12,9 +12,9 @@ from .. import services class Member(rio.Component): database_service: services.DatabaseService - def __init__(self, database_service: services.database_service.DatabaseService) -> None: + def __init__(self) -> None: super().__init__() - self.database_service = database_service + self.database_service = self.session[services.DatabaseService] @rio.event.on_populate async def on_populate(self) -> None: diff --git a/ezgg_website/pages/pics.py b/ezgg_website/pages/pics.py index 4bd7861..b6d2ac4 100644 --- a/ezgg_website/pages/pics.py +++ b/ezgg_website/pages/pics.py @@ -13,9 +13,9 @@ class Pics(rio.Component): database_service: services.DatabaseService active_picture: Optional[rio.URL] - def __init__(self, database_service: services.database_service.DatabaseService) -> None: + def __init__(self) -> None: super().__init__() - self.database_service = database_service + self.database_service = self.session[services.DatabaseService] self.active_picture: Optional[rio.URL] = None @rio.event.on_populate