Various smaller improvements

src/ezgg_lan_manager/components/CateringOrderItem.py

@@ -1,7 +1,6 @@
 from typing import Callable
 
-from rio import Component, Row, Text, TextStyle, Color, Rectangle, CursorStyle
-from rio.components.pointer_event_listener import PointerEvent, PointerEventListener
+from rio import Component, Row, Text, TextStyle, Color, Rectangle, PointerEventListener
 
 from src.ezgg_lan_manager.types.CateringOrder import CateringOrderStatus, CateringOrder
 
@@ -41,7 +40,7 @@ class CateringOrderItem(Component):
                 fill=self.session.theme.primary_color,
                 hover_fill=self.session.theme.hud_color,
                 transition_time=0.1,
-                cursor=CursorStyle.POINTER
+                cursor="pointer"
             ),
             on_press=lambda _: self.info_modal_cb(self.order),
         )

src/ezgg_lan_manager/components/DesktopNavigation.py

@@ -1,4 +1,3 @@
-from copy import copy, deepcopy
 from typing import Optional, Callable
 
 from rio import *

src/ezgg_lan_manager/components/ShoppingCartAndOrders.py

@@ -1,8 +1,7 @@
 from asyncio import sleep, create_task
 from decimal import Decimal
 
-import rio
-from rio import Component, Column, Text, TextStyle, Button, Row, ScrollContainer, Spacer, Popup, Table, event
+from rio import Component, Column, Text, TextStyle, Button, Row, ScrollContainer, Spacer, Popup, Table, event, Card
 
 from src.ezgg_lan_manager.components.CateringCartItem import CateringCartItem
 from src.ezgg_lan_manager.components.CateringOrderItem import CateringOrderItem
@@ -97,7 +96,7 @@ class ShoppingCartAndOrders(Component):
             show_popup_task = create_task(self.show_popup("Bestellung erfolgreich aufgegeben!", False))
 
     async def _create_order_info_modal(self, order: CateringOrder) -> None:
-        def build_dialog_content() -> rio.Component:
+        def build_dialog_content() -> Component:
             # @todo: rio 0.10.8 did not have the ability to align the columns, check back in a future version
             table = Table(
                         {
@@ -107,9 +106,9 @@ class ShoppingCartAndOrders(Component):
                         },
                         show_row_numbers=False
                     )
-            return rio.Card(
-                rio.Column(
-                    rio.Text(
+            return Card(
+                Column(
+                    Text(
                         f"Deine Bestellung ({order.order_id})",
                         align_x=0.5,
                         margin_bottom=0.5
@@ -134,7 +133,7 @@ class ShoppingCartAndOrders(Component):
         )
         await dialog.wait_for_close()
 
-    def build(self) -> rio.Component:
+    def build(self) -> Component:
         user_id = self.session[SessionStorage].user_id
         catering_service = self.session[CateringService]
         cart = catering_service.get_cart(user_id)
@@ -155,7 +154,6 @@ class ShoppingCartAndOrders(Component):
                 margin=1
             )
             return Column(
-                    cart_container,
                     Popup(
                         anchor=cart_container,
                         content=Text(self.popup_message, style=TextStyle(fill=self.session.theme.danger_color if self.popup_is_error else self.session.theme.success_color), overflow="wrap", margin=2, justify="center", min_width=20),