mystiatech/Sage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(01-11): integrate router into main app with error handling

Browse Source 
- Updated main.dart to use ProviderScope and MaterialApp.router
- Integrated AppRouter with proper GoRouter configuration
- Added comprehensive error handling with ErrorBoundary widget
- Updated HomePage to use auth provider for logout functionality
- Fixed SplashPage to use GoRouter navigation
- Implemented router provider for Riverpod integration
- Added proper resource disposal and restart functionality

Files modified:
- lib/main.dart (complete app structure)
- lib/core/router/app_router.dart (router integration)
- lib/features/authentication/presentation/pages/splash_page.dart (navigation fix)
- lib/features/home/presentation/pages/home_page.dart (logout implementation)
This commit is contained in:
Dani B
2026-01-28 11:22:56 -05:00
parent 1410e32005
commit 37139bdb06
4 changed files with 162 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
lib/core/router/app_router.dart
View File

@@ -13,19 +13,13 @@ import '../../features/authentication/presentation/pages/splash_page.dart';
///
/// Handles navigation with authentication state awareness and protected routes
class AppRouter {
static final GoRouter _router = GoRouter(
static GoRouter _router({required WidgetRef ref}) {
return GoRouter(
initialLocation: '/',
debugLogDiagnostics: true,
redirect: (context, state) {
final authState = state.extra as AuthState?;
// If no auth state in extra, check from provider
if (authState == null) {
final container = ProviderScope.containerOf(context, listen: false);
final authNotifier = container.read(authStateProvider.notifier);
// For now, we'll use Supabase directly for auth state checking
// This will be improved when auth provider is fully integrated
// For now, use Supabase directly for auth state checking
// This will be improved when auth provider integration is complete
final currentUser = Supabase.instance.client.auth.currentUser;
// Allow splash page regardless of auth state
@@ -43,48 +37,29 @@ class AppRouter {
return '/home';
}
return null;
}
// TODO: Update to use AuthState when fully integrated
// For now, use Supabase auth state directly
final currentUser = Supabase.instance.client.auth.currentUser;
if (currentUser == null && !state.location.startsWith('/login') && !state.location.startsWith('/signup')) {
return '/login';
}
if (currentUser != null && (state.location.startsWith('/login') || state.location.startsWith('/signup'))) {
return '/home';
}
return null;
},
routes: [
// Splash route - initial loading screen
GoRoute(
path: '/splash',
name: 'splash',
builder: (context, state) => const SplashPage(),
),
// Authentication routes (public)
GoRoute(
path: '/login',
name: 'login',
builder: (context, state) => const LoginPage(),
),
GoRoute(
path: '/signup',
name: 'signup',
builder: (context, state) => const SignupPage(),
),
// Protected routes (require authentication)
GoRoute(
path: '/home',
name: 'home',
builder: (context, state) => const HomePage(),
),
@@ -101,7 +76,6 @@ class AppRouter {
// Example:
// GoRoute(
// path: '/inventory',
// name: 'inventory',
// builder: (context, state) => const InventoryPage(),
// ),
],
@@ -150,10 +124,10 @@ class AppRouter {
);
/// Get the router instance
static GoRouter get router => _router;
static GoRouter router({required WidgetRef ref}) => _router(ref: ref);
}
/// Router provider for Riverpod integration
final routerProvider = Provider<GoRouter>((ref) {
return AppRouter.router;
return AppRouter.router(ref: ref);
});

23
lib/features/authentication/presentation/pages/splash_page.dart
View File

@@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:supabase_flutter/supabase_flutter.dart';
import 'package:go_router/go_router.dart';
/// Splash page for initial loading and authentication state checking
///
@@ -33,18 +34,14 @@ class _SplashPageState extends ConsumerState<SplashPage> {
if (currentUser != null) {
// User is authenticated, navigate to home
// TODO: Use GoRouter when integrated
// Navigator.of(context).pushReplacementNamed('/home');
// For now, we'll use a simple navigation
Navigator.of(context).pushReplacementNamed('/home');
if (mounted) {
context.go('/home');
}
} else {
// User is not authenticated, navigate to login
// TODO: Use GoRouter when integrated
// Navigator.of(context).pushReplacementNamed('/login');
// For now, we'll use a simple navigation
Navigator.of(context).pushReplacementNamed('/login');
if (mounted) {
context.go('/login');
}
}
} catch (e) {
// Handle authentication state check errors
@@ -52,8 +49,10 @@ class _SplashPageState extends ConsumerState<SplashPage> {
if (!mounted) return;
// On error, navigate to login for safety
Navigator.of(context).pushReplacementNamed('/login');
// On error, navigate to login for safety
if (mounted) {
context.go('/login');
}
}
}

16
lib/features/home/presentation/pages/home_page.dart
View File

@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import '../../providers/auth_provider.dart';
import '../../../providers/auth_provider.dart';
/// Home page for authenticated users
///
@@ -21,8 +21,18 @@ class HomePage extends ConsumerWidget {
IconButton(
icon: const Icon(Icons.logout),
onPressed: () async {
// TODO: Implement logout functionality
// await ref.read(authStateProvider.notifier).signOut();
try {
await ref.read(authProvider.notifier).signOut();
} catch (e) {
if (context.mounted) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text('Logout failed: ${e.toString()}'),
backgroundColor: Colors.red,
),
);
}
}
},
tooltip: 'Logout',
),

133
lib/main.dart
View File

@@ -1,7 +1,12 @@
import 'package:flutter/material.dart';
import 'package:supabase_flutter/supabase_flutter.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:go_router/go_router.dart';
import 'core/constants/supabase_constants.dart';
import 'core/router/app_router.dart';
import 'providers/auth_provider.dart';
void main() async {
WidgetsFlutterBinding.ensureInitialized();
@@ -21,25 +26,143 @@ void main() async {
debugPrint('Failed to initialize Supabase: $e');
}
runApp(const SageApp());
runApp(const ProviderScope(child: SageApp()));
}
class SageApp extends StatelessWidget {
class SageApp extends ConsumerWidget {
const SageApp({super.key});
@override
Widget build(BuildContext context) {
return MaterialApp(
Widget build(BuildContext context, WidgetRef ref) {
final router = ref.watch(routerProvider);
return MaterialApp.router(
title: 'Sage - Food Inventory Tracker',
debugShowCheckedModeBanner: false,
theme: ThemeData(
colorScheme: ColorScheme.fromSeed(seedColor: Colors.green),
useMaterial3: true,
),
home: const HomePage(),
routerConfig: router,
builder: (context, child) {
// Set up error handling for the entire app
return ErrorBoundary(
child: child!,
);
},
);
}
}
/// Error boundary widget for catching and displaying errors
class ErrorBoundary extends StatelessWidget {
final Widget child;
const ErrorBoundary({
super.key,
required this.child,
});
@override
Widget build(BuildContext context) {
return MaterialApp(
debugShowCheckedModeBanner: false,
home: child,
builder: (context, widget) {
ErrorWidget.builder = (FlutterErrorDetails errorDetails) {
return CustomErrorWidget(errorDetails: errorDetails);
};
return widget!;
},
);
}
}
/// Custom error widget for better error display
class CustomErrorWidget extends StatelessWidget {
final FlutterErrorDetails errorDetails;
const CustomErrorWidget({
super.key,
required this.errorDetails,
});
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: Colors.red[50],
appBar: AppBar(
title: const Text('Error'),
backgroundColor: Colors.red[100],
),
body: Center(
child: Padding(
padding: const EdgeInsets.all(16),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
const Icon(
Icons.error_outline,
size: 64,
color: Colors.red,
),
const SizedBox(height: 16),
const Text(
'An error occurred',
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold,
color: Colors.red,
),
),
const SizedBox(height: 8),
Text(
'Please restart the app and try again.',
style: TextStyle(
fontSize: 16,
color: Colors.red[700],
),
textAlign: TextAlign.center,
),
if (debugMode) ...[
const SizedBox(height: 16),
Container(
padding: const EdgeInsets.all(8),
decoration: BoxDecoration(
color: Colors.red[100],
borderRadius: BorderRadius.circular(8),
),
child: Text(
errorDetails.toString(),
style: const TextStyle(
fontSize: 12,
fontFamily: 'monospace',
),
),
),
],
const SizedBox(height: 24),
ElevatedButton(
onPressed: () {
// Attempt to restart the app by navigating to splash
GoRouter.of(context).go('/splash');
},
style: ElevatedButton.styleFrom(
backgroundColor: Colors.red,
foregroundColor: Colors.white,
),
child: const Text('Restart App'),
),
],
),
),
),
);
}
bool get debugMode => !const bool.fromEnvironment('dart.vm.product');
}
class HomePage extends StatelessWidget {
const HomePage({super.key});