Frontend groups

backend/main.py

@@ -16,7 +16,7 @@
     edit_task,
     delete_task,
     get_user_task,
-    get_group
+    get_group,
     create_group,
     leave_group,
     delete_group,
@@ -234,8 +234,24 @@ def handle_login() -> Response:
         make_new_log("login", e)
         return response_json
 
+    try:
+        data_con = connect("data/data.db")
+        data_cursor = data_con.cursor()
+        data_cursor.execute(
+            "SELECT username FROM user WHERE uuid = ?;",
+            (user_id,),
+        )
+        username = data_cursor.fetchone()[0]
+        data_con.close()
+    except Exception as e:
+        response_json = jsonify(
+            [{"error_no": "2", "message": "Trouble with backend! Sorry!"}]
+        )
+        make_new_log("login", e)
+        return response_json
+
     response_json = jsonify(
-        [{"error_no": "0", "message": "success", "user_id": user_id}]
+        [{"error_no": "0", "message": "success", "user_id": user_id, "username": username}]
     )
     return response_json
 
@@ -1061,7 +1077,7 @@ def handle_invite_to_group() -> Response:
 
     try:
         # Verify password before inviting
-        if not check_password(connect("../data/data.db"), inviter_id, password):
+        if not check_password(connect("data/data.db"), inviter_id, password):
             response_json = jsonify(
                 [{"error_no": "4", "message": "Password is incorrect"}]
             )
@@ -1174,6 +1190,7 @@ def handle_respond_to_invite() -> Response:
     response_json = jsonify([{"error_no": "0", "message": f"Successfully {status} invitation"}])
     return response_json
 
+
 if __name__ == "__main__":
     print("Running main.py")
     make_new_log("main", "Server started")  # type: ignore

roomiebuddy/lib/NavScreen.dart

@@ -6,7 +6,7 @@ import 'package:roomiebuddy/providers/theme_provider.dart';
 import 'pages/home_page.dart';
 import 'pages/calendar_page.dart';
 import 'pages/add_taskpage.dart';
-import 'pages/add_roomate_page.dart';
+import 'pages/group_page.dart';
 import 'pages/settings_page.dart';
 
 class Navscreen extends StatefulWidget {
@@ -21,7 +21,7 @@ class _NavscreenState extends State<Navscreen> {
     HomePage(),
     CalendarPage(),
     AddTaskpage(),
-    AddRoomatePage(),
+    GroupPage(),
     SettingsPage(),
   ];
   int selectedIndex = 0;

roomiebuddy/lib/main.dart

@@ -17,13 +17,12 @@ class MyApp extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final themeProvider = Provider.of<ThemeProvider>(context);
+
     return MaterialApp(
       debugShowCheckedModeBanner: false,
       title: 'Roomie Buddy',
-      theme: ThemeData(
-        colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple),
-        useMaterial3: true,
-      ),
+      theme: themeProvider.themeData,
       home: const LoginScreen(clearCredentials: false), // Set to false to enable "remember me" functionality
     );
   }

roomiebuddy/lib/pages/add_taskpage.dart

@@ -25,7 +25,13 @@ class _AddTaskpageState extends State<AddTaskpage> {
 
     return Scaffold(
       appBar: AppBar(
-        title: Text('Add Task', style: TextStyle(color: themeProvider.lightTextColor)),
+        title: Text(
+          'Add Task',
+          style: TextStyle(
+            color: themeProvider.currentTextColor,
+            fontWeight: FontWeight.bold
+          ),
+        ),
       ),
       body: SingleChildScrollView(
         padding: const EdgeInsets.all(16.0),