wip / do not merge

VERSION

@@ -1 +1 @@
-0.3.7
+0.3.6

src/EzggLanManager.py

@@ -27,7 +27,10 @@ if __name__ == "__main__":
         corner_radius_small=0,
         corner_radius_medium=0,
         corner_radius_large=0,
-        font=Font(from_root("src/ezgg_lan_manager/assets/fonts/joystix.otf"))
+        font=Font(
+            regular=from_root("src/ezgg_lan_manager/assets/fonts/PixelOperatorMono.ttf"),
+            bold=from_root("src/ezgg_lan_manager/assets/fonts/PixelOperatorMono-Bold.ttf"),
+        )
     )
     default_attachments: list = [LocalData(stored_session_token=None)]
     default_attachments.extend(init_services())

src/ezgg_lan_manager/components/DesktopNavigation.py

@@ -47,8 +47,8 @@ class DesktopNavigation(Component):
 
         return Card(
             Column(
-                Text(lan_info.name, align_x=0.5, margin_top=0.3, style=TextStyle(fill=self.session.theme.hud_color, font_size=1.9)),
-                Text(f"Edition {lan_info.iteration}", align_x=0.5, style=TextStyle(fill=self.session.theme.hud_color, font_size=1.2), margin_top=0.3, margin_bottom=2),
+                Text(lan_info.name, align_x=0.5, margin_top=0.3, style=TextStyle(fill=self.session.theme.hud_color, font_size=2.5), font_weight="bold"),
+                Text(f"Edition {lan_info.iteration}", align_x=0.5, style=TextStyle(fill=self.session.theme.hud_color, font_size=1.6), margin_top=0.3, margin_bottom=2, font_weight="bold"),
                 user_info_and_login_box,
                 *navigation,
                 Text("Unsere Sponsoren", align_x=0.5, style=TextStyle(fill=self.session.theme.hud_color, font_size=0.9), margin_bottom=0.5, margin_top=1),

src/ezgg_lan_manager/components/DesktopNavigationButton.py

@@ -1,7 +1,7 @@
 from rio import Component, TextStyle, Color, Link, Button, Text
 
 class DesktopNavigationButton(Component):
-    STYLE = TextStyle(fill=Color.from_hex("02dac5"), font_size=0.9)
+    STYLE = TextStyle(fill=Color.from_hex("02dac5"), font_size=1.2, font_weight="bold")
     TEAM_STYLE = TextStyle(fill=Color.from_hex("F0EADE"), font_size=0.9)
     label: str
     target_url: str

src/ezgg_lan_manager/components/UserInfoBox.py

@@ -60,10 +60,8 @@ class UserInfoBox(Component):
         self.session[LocalDataService].del_session(self.session[LocalData].stored_session_token)
         self.session[LocalData].stored_session_token = None
         self.session.attach(self.session[LocalData])
-        if self.status_change_cb is not None:
-            await self.status_change_cb()
+        await self.status_change_cb()
         await self.session[RefreshService].trigger_refresh()
-        self.session.navigate_to("")
 
     @event.on_populate
     async def async_init(self) -> None:

src/ezgg_lan_manager/pages/Account.py

@@ -1,7 +1,7 @@
 from decimal import Decimal
 from typing import Optional
 
-from rio import Column, Component, event, Text, TextStyle, Button, Color, Revealer, Row, ProgressCircle, Link, Image
+from rio import Column, Component, event, Text, TextStyle, Button, Color, Revealer, Row, ProgressCircle, Link
 
 from src.ezgg_lan_manager import ConfigurationService, UserService, AccountingService
 from src.ezgg_lan_manager.components.MainViewContentBox import MainViewContentBox
@@ -14,7 +14,6 @@ class AccountPage(Component):
     user: Optional[User] = None
     balance: Optional[Decimal] = None
     transaction_history: list[Transaction] = list()
-    payment_qr_image: bytes = None
     banking_info_revealer_open: bool = False
     paypal_info_revealer_open: bool = False
 
@@ -29,11 +28,6 @@ class AccountPage(Component):
             self.user = await self.session[UserService].get_user(user_id)
             self.balance = await self.session[AccountingService].get_balance(user_id)
             self.transaction_history = await self.session[AccountingService].get_transaction_history(user_id)
-            self.payment_qr_image = self.session[AccountingService].make_payment_qr_image(
-                    "Einfach Zocken Gaming Gesellschaft",
-                    "GENODE51BIK",
-                    "DE47517624340019856607",
-                    f"AUFLADUNG - {self.user.user_id} - {self.user.user_name}")
 
     async def _on_banking_info_press(self) -> None:
         self.banking_info_revealer_open = not self.banking_info_revealer_open
@@ -42,7 +36,7 @@ class AccountPage(Component):
         self.paypal_info_revealer_open = not self.paypal_info_revealer_open
 
     def build(self) -> Component:
-        if not self.user or not self.payment_qr_image:
+        if not self.user and not self.balance:
             return Column(
                 MainViewContentBox(
                     ProgressCircle(
@@ -91,10 +85,6 @@ class AccountPage(Component):
                     margin=0,
                     margin_bottom=1,
                     align_x=0.5
-                ),
-                Image(self.payment_qr_image,
-                      min_width=20,
-                      min_height=20
                 )
             ),
             margin=2,
@@ -233,20 +223,19 @@ class AccountPage(Component):
                         on_press=self._on_paypal_info_press
                     ),
                     paypal_info_revealer,
-                    # Disabled because people did not understand the fee's and kept charging 24.03 € to their accounts
-                    # Link(
-                    #     content=Button(
-                    #         content=Text("PAYPAL (3% Gebühr - Gewerblich)", style=TextStyle(fill=Color.from_hex("121212"), font_size=0.8), justify="center"),
-                    #         shape="rectangle",
-                    #         style="major",
-                    #         color="secondary",
-                    #         grow_x=True,
-                    #         margin=2,
-                    #         margin_top=0
-                    #     ),
-                    #     target_url="https://www.paypal.com/ncp/payment/89YMGVZ4S33RS",
-                    #     open_in_new_tab=True
-                    # )
+                    Link(
+                        content=Button(
+                            content=Text("PAYPAL (3% Gebühr - Gewerblich)", style=TextStyle(fill=Color.from_hex("121212"), font_size=0.8), justify="center"),
+                            shape="rectangle",
+                            style="major",
+                            color="secondary",
+                            grow_x=True,
+                            margin=2,
+                            margin_top=0
+                        ),
+                        target_url="https://www.paypal.com/ncp/payment/89YMGVZ4S33RS",
+                        open_in_new_tab=True
+                    )
                 )
             ),
             MainViewContentBox(

src/ezgg_lan_manager/services/AccountingService.py

@@ -1,6 +1,4 @@
-import io
 import logging
-import qrcode
 from collections.abc import Callable
 from datetime import datetime
 from decimal import Decimal, ROUND_DOWN
@@ -76,29 +74,3 @@ class AccountingService:
             return "0.00 €"
         rounded_decimal = str(euros.quantize(Decimal(".01"), rounding=ROUND_DOWN))
         return f"{rounded_decimal} €"
-
-    @staticmethod
-    def make_payment_qr_image(beneficiary_name, beneficiary_bic, beneficiary_iban, text, amount_euros=None) -> bytes:
-        text = text.replace("\n",";")
-        amount_formatted = "EUR{:.2f}".format(amount_euros) if amount_euros else ""
-        epc_text = f"""BCD
-002
-1
-SCT
-{beneficiary_bic}
-{beneficiary_name}
-{beneficiary_iban}
-{amount_formatted}
-
-
-{text}
-"""
-        qr = qrcode.QRCode(
-            version=6,
-            error_correction=qrcode.constants.ERROR_CORRECT_M,
-        )
-        qr.add_data(epc_text)
-        img = qr.make_image()
-        img_bytes = io.BytesIO()
-        img.save(img_bytes)
-        return img_bytes.getvalue()

src/ezgg_lan_manager/services/LocalDataService.py

@@ -21,6 +21,5 @@ class LocalDataService:
         self._session[key] = session
         return key
 
-    def del_session(self, token: Optional[str]) -> None:
-        if token is not None:
-            self._session.pop(token, None)
+    def del_session(self, token: str) -> None:
+        self._session.pop(token, None)