Merge main into sweep/account-deletion

yihong1120 · Dec 31, 2023 · 2bafac3 · 2bafac3
2 parents f9942a9 + 6e97965
commit 2bafac3
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 183 deletions.
diff --git a/lib/main.dart b/lib/main.dart
@@ -22,7 +22,7 @@ class TrafficReportApp extends StatelessWidget {
         colorScheme: ColorScheme.fromSeed(seedColor: Colors.blue),
         useMaterial3: true,
       ),
-      initialRoute: '/',
+
       routes: {
         ...map_routes.mapRoutes,
         ...reports_routes.reportsRoutes,

diff --git a/lib/screens/accounts/routes.dart b/lib/screens/accounts/routes.dart
@@ -10,7 +10,7 @@ import 'social_connections_page.dart';
 
 Map<String, WidgetBuilder> accountsRoutes = {
     '/login': (context) => const LoginPage(),
-    '/account': (context) => const AccountPage(),
+    '/accounts': (context) => const AccountPage(),
     '/register': (context) => const RegisterPage(),
     '/verify': (context) => const VerifyPage(),
     '/account-delete-confirm': (context) => const AccountDeleteConfirmPage(),

diff --git a/lib/screens/map/routes.dart b/lib/screens/map/routes.dart
@@ -2,6 +2,6 @@ import 'package:flutter/material.dart';
 import 'home_map.dart';
 
 Map<String, WidgetBuilder> mapRoutes = {
-  '/': (context) => const HomeMapScreen(),
+  '/home': (context) => const HomeMapScreen(),
   // ... 其他地圖相關路由
 };
diff --git a/test/report_service_test.dart b/test/report_service_test.dart
diff --git a/test/screens/reports/edit_report_screen_test.dart b/test/screens/reports/edit_report_screen_test.dart
diff --git a/test/screens/reports/report_list_screen_test.dart b/test/screens/reports/report_list_screen_test.dart
diff --git a/test/screens/reports/routes_test.dart b/test/screens/reports/routes_test.dart
diff --git a/test/social_service_test.dart b/test/social_service_test.dart
diff --git a/test/widget_test.dart b/test/widget_test.dart