diff --git a/ezgg_website/assets/logo_thick.svg b/ezgg_website/assets/logo_thick.svg new file mode 100644 index 0000000..2d761c7 --- /dev/null +++ b/ezgg_website/assets/logo_thick.svg @@ -0,0 +1,428 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/ezgg_website/assets/meterpokal.jpg b/ezgg_website/assets/meterpokal.jpg new file mode 100644 index 0000000..0dd95af Binary files /dev/null and b/ezgg_website/assets/meterpokal.jpg differ diff --git a/ezgg_website/assets/news_14_04_25.md b/ezgg_website/assets/news_14_04_25.md new file mode 100644 index 0000000..414b2eb --- /dev/null +++ b/ezgg_website/assets/news_14_04_25.md @@ -0,0 +1,3 @@ +Die EZ GG kehrt siegreich von der BieberLAN 48 zurück. Unter größten Anstrengungen wurden 52 Meterpunkte ertrunken, und der Meterpokal errungen. + +Damit ist die EZ GG e.V. Meter-Meister der BieberLAN 48 🥳. \ No newline at end of file diff --git a/ezgg_website/components/navigation.py b/ezgg_website/components/navigation.py index 9e8d714..d648369 100644 --- a/ezgg_website/components/navigation.py +++ b/ezgg_website/components/navigation.py @@ -15,6 +15,7 @@ class NavigationLink: NAVIGATION_LINKS = [ NavigationLink("Start", "material/home", "/"), NavigationLink("Über den Verein", "material/info", "/about"), + NavigationLink("Unsere LAN-Party", "material/videogame_asset", "https://ez-lan.de"), NavigationLink("Mitglieder", "material/groups", "/member"), NavigationLink("Satzung", "material/contract", "/constitution"), NavigationLink("Mitglied werden", "material/contract-edit", "/join"), diff --git a/ezgg_website/pages/home.py b/ezgg_website/pages/home.py index 751cb81..15e9384 100644 --- a/ezgg_website/pages/home.py +++ b/ezgg_website/pages/home.py @@ -32,6 +32,15 @@ class Home(rio.Component): margin_bottom=1, margin_right=1 ), + comps.build_news_post( + header="Meter-Meister EZ GG !", + article_text_path_or_text=from_root("ezgg_website/assets/news_14_04_25.md"), + date="14.04.2025", + images=[NewsPostImage( + from_root("ezgg_website/assets/meterpokal.jpg"), + "https://verwaltung.ezgg-ev.de/adm_program/modules/photos/photo_show.php?photo_uuid=133f2828-15c6-4105-acdb-272da9774a3f&photo_nr=18" + )], + ), comps.build_news_post( header="Hier kommt die EZ-LAN", article_text_path_or_text=from_root("ezgg_website/assets/news_27_03_25.md"), diff --git a/ezgg_website/pages/pics.py b/ezgg_website/pages/pics.py index 20434ca..0aebec9 100644 --- a/ezgg_website/pages/pics.py +++ b/ezgg_website/pages/pics.py @@ -24,10 +24,11 @@ class Pics(rio.Component): if self.active_picture is None: grid = rio.Grid(row_spacing=0.4, column_spacing=0.5, margin_right=1) for i, link in enumerate(self.session[services.DatabaseService].get_picture_paths()): + thumbnail_link = rio.URL(str(link) + "&thumb=1") grid.add( rio.Button( rio.Image( - link, + thumbnail_link, height=12, width=12 ), diff --git a/ezgg_website/services/database_service.py b/ezgg_website/services/database_service.py index c0137ee..0156b12 100644 --- a/ezgg_website/services/database_service.py +++ b/ezgg_website/services/database_service.py @@ -134,6 +134,27 @@ class DatabaseService: def get_picture_paths(self) -> list[rio.URL]: return [ + # BieberLAN 48 + rio.URL("https://verwaltung.ezgg-ev.de/adm_program/modules/photos/photo_show.php?photo_uuid=133f2828-15c6-4105-acdb-272da9774a3f&photo_nr=1"), + rio.URL("https://verwaltung.ezgg-ev.de/adm_program/modules/photos/photo_show.php?photo_uuid=133f2828-15c6-4105-acdb-272da9774a3f&photo_nr=2"), + rio.URL("https://verwaltung.ezgg-ev.de/adm_program/modules/photos/photo_show.php?photo_uuid=133f2828-15c6-4105-acdb-272da9774a3f&photo_nr=3"), + rio.URL("https://verwaltung.ezgg-ev.de/adm_program/modules/photos/photo_show.php?photo_uuid=133f2828-15c6-4105-acdb-272da9774a3f&photo_nr=4"), + rio.URL("https://verwaltung.ezgg-ev.de/adm_program/modules/photos/photo_show.php?photo_uuid=133f2828-15c6-4105-acdb-272da9774a3f&photo_nr=5"), + rio.URL("https://verwaltung.ezgg-ev.de/adm_program/modules/photos/photo_show.php?photo_uuid=133f2828-15c6-4105-acdb-272da9774a3f&photo_nr=6"), + rio.URL("https://verwaltung.ezgg-ev.de/adm_program/modules/photos/photo_show.php?photo_uuid=133f2828-15c6-4105-acdb-272da9774a3f&photo_nr=7"), + rio.URL("https://verwaltung.ezgg-ev.de/adm_program/modules/photos/photo_show.php?photo_uuid=133f2828-15c6-4105-acdb-272da9774a3f&photo_nr=8"), + rio.URL("https://verwaltung.ezgg-ev.de/adm_program/modules/photos/photo_show.php?photo_uuid=133f2828-15c6-4105-acdb-272da9774a3f&photo_nr=9"), + rio.URL("https://verwaltung.ezgg-ev.de/adm_program/modules/photos/photo_show.php?photo_uuid=133f2828-15c6-4105-acdb-272da9774a3f&photo_nr=10"), + rio.URL("https://verwaltung.ezgg-ev.de/adm_program/modules/photos/photo_show.php?photo_uuid=133f2828-15c6-4105-acdb-272da9774a3f&photo_nr=11"), + rio.URL("https://verwaltung.ezgg-ev.de/adm_program/modules/photos/photo_show.php?photo_uuid=133f2828-15c6-4105-acdb-272da9774a3f&photo_nr=12"), + rio.URL("https://verwaltung.ezgg-ev.de/adm_program/modules/photos/photo_show.php?photo_uuid=133f2828-15c6-4105-acdb-272da9774a3f&photo_nr=13"), + rio.URL("https://verwaltung.ezgg-ev.de/adm_program/modules/photos/photo_show.php?photo_uuid=133f2828-15c6-4105-acdb-272da9774a3f&photo_nr=14"), + rio.URL("https://verwaltung.ezgg-ev.de/adm_program/modules/photos/photo_show.php?photo_uuid=133f2828-15c6-4105-acdb-272da9774a3f&photo_nr=15"), + rio.URL("https://verwaltung.ezgg-ev.de/adm_program/modules/photos/photo_show.php?photo_uuid=133f2828-15c6-4105-acdb-272da9774a3f&photo_nr=16"), + rio.URL("https://verwaltung.ezgg-ev.de/adm_program/modules/photos/photo_show.php?photo_uuid=133f2828-15c6-4105-acdb-272da9774a3f&photo_nr=17"), + rio.URL("https://verwaltung.ezgg-ev.de/adm_program/modules/photos/photo_show.php?photo_uuid=133f2828-15c6-4105-acdb-272da9774a3f&photo_nr=18"), + rio.URL("https://verwaltung.ezgg-ev.de/adm_program/modules/photos/photo_show.php?photo_uuid=133f2828-15c6-4105-acdb-272da9774a3f&photo_nr=19"), + # BK-LAN LuxusLAN 15 rio.URL("https://verwaltung.ezgg-ev.de/adm_program/modules/photos/photo_show.php?photo_uuid=bc0c54ce-a87e-426a-893d-2bbcc2c28ce3&photo_nr=10"), rio.URL("https://verwaltung.ezgg-ev.de/adm_program/modules/photos/photo_show.php?photo_uuid=bc0c54ce-a87e-426a-893d-2bbcc2c28ce3&photo_nr=2"),