diff --git a/src/pages/home.py b/src/pages/home.py index a0f6537..ef9939f 100644 --- a/src/pages/home.py +++ b/src/pages/home.py @@ -8,39 +8,44 @@ def HomePage(): ft.Text((_("Home")), size=30, weight="bold"), ft.Text("\n", size=30, weight="bold"), ft.Row([ - ft.Container( # Timetable Card - content=ft.Column([ - ft.Row([ - ft.Icon(ft.Icons.BACKPACK_OUTLINED, size=32, color="#FFFFFF"), - ft.Text((_("Timetable")), size=24, font_family="Roboto", weight="bold") + ft.Card( + content=ft.Container( # Timetable Card + content=ft.Column([ + ft.Row([ + ft.Icon(ft.Icons.BACKPACK_OUTLINED, size=32, color="#FFFFFF"), + ft.Text((_("Timetable")), size=24, font_family="Roboto", weight="bold") + ]), + ft.ListView( + controls=[ + ft.Placeholder() + ], + expand=True, + spacing=10, + padding=10, + auto_scroll=False + ) ]), - ft.ListView( - controls=[ - ft.Placeholder() - ], - expand=True, - spacing=10, - padding=10, - auto_scroll=False - ) - ]), - margin=20, - padding=10, - alignment=ft.alignment.top_left, - bgcolor=ft.Colors.SURFACE_CONTAINER_HIGHEST, + #margin=20, + padding=10, + alignment=ft.alignment.top_left, + ), width=420, - height=270, - border_radius=10, + height=275, ), - ft.Container( # Recent Grades Card - content=RecentGradesColumn(), # Use the imported function here - margin=20, - padding=10, - alignment=ft.alignment.top_left, - bgcolor=ft.Colors.SURFACE_CONTAINER_HIGHEST, + + ft.Card( + content=ft.Container( # Recent Grades Card + content=RecentGradesColumn(), # Use the imported function here + #margin=20, + padding=10, + alignment=ft.alignment.top_left, + #bgcolor=ft.Colors.SURFACE_CONTAINER_HIGHEST, + #width=420, + #height=270, + #border_radius=10 + ), width=420, - height=270, - border_radius=10, - ) - ]) + height=275, + ), + ]), ]) \ No newline at end of file