Pages Architecture

lib/core/di/di.dart

@@ -0,0 +1,101 @@
+import 'package:flutter_dotenv/flutter_dotenv.dart';
+import 'package:get_it/get_it.dart';
+import 'package:supabase_flutter/supabase_flutter.dart';
+import 'package:flutter_stripe/flutter_stripe.dart';
+import 'package:flutter_local_notifications/flutter_local_notifications.dart';
+import 'package:go_router/go_router.dart';
+
+// services
+import 'package:clean_stream_laundry_app/logic/services/auth_service.dart';
+import 'package:clean_stream_laundry_app/logic/services/edge_function_service.dart';
+import 'package:clean_stream_laundry_app/logic/services/location_service.dart';
+import 'package:clean_stream_laundry_app/logic/services/machine_communication_service.dart';
+import 'package:clean_stream_laundry_app/logic/services/machine_service.dart';
+import 'package:clean_stream_laundry_app/logic/services/payment_service.dart';
+import 'package:clean_stream_laundry_app/logic/services/profile_service.dart';
+import 'package:clean_stream_laundry_app/logic/services/transaction_service.dart';
+
+// implementations
+import 'package:clean_stream_laundry_app/services/supabase/supabase_auth_service.dart';
+import 'package:clean_stream_laundry_app/services/supabase/supabase_edge_function_service.dart';
+import 'package:clean_stream_laundry_app/services/supabase/supabase_location_service.dart';
+import 'package:clean_stream_laundry_app/services/supabase/supabase_machine_service.dart';
+import 'package:clean_stream_laundry_app/services/supabase/supabase_profile_service.dart';
+import 'package:clean_stream_laundry_app/services/supabase/supabase_transaction_service.dart';
+import 'package:clean_stream_laundry_app/services/stripe/stripe_service.dart';
+import 'package:clean_stream_laundry_app/services/nayax/machine_communicator.dart';
+
+// misc
+import 'package:clean_stream_laundry_app/core/router/app_router.dart';
+import 'package:clean_stream_laundry_app/services/notification_service.dart';
+import 'package:clean_stream_laundry_app/logic/payment/process_payment.dart';
+
+final getIt = GetIt.instance;
+
+Future<void> setupDependencies() async {
+  await dotenv.load(fileName: '.env');
+
+  await Supabase.initialize(
+    url: dotenv.env['SUPABASE_URL']!,
+    anonKey: dotenv.env['ANON_KEY']!,
+  );
+
+  final supabase = Supabase.instance.client;
+
+  Stripe.publishableKey = dotenv.env['STRIPE_PUBLISHABLE_KEY']!;
+
+  getIt.registerLazySingleton<TransactionService>(
+        () => SupabaseTransactionService(client: supabase),
+  );
+
+  getIt.registerLazySingleton<ProfileService>(
+        () => SupabaseProfileService(client: supabase),
+  );
+
+  getIt.registerLazySingleton<MachineService>(
+        () => SupabaseMachineService(client: supabase),
+  );
+
+  getIt.registerLazySingleton<LocationService>(
+        () => SupabaseLocationHandler(client: supabase),
+  );
+
+  getIt.registerLazySingleton<EdgeFunctionService>(
+        () => SupabaseEdgeFunctionService(client: supabase),
+  );
+
+  getIt.registerLazySingleton<AuthService>(
+        () => SupabaseAuthService(client: supabase),
+  );
+
+  getIt.registerLazySingleton<PaymentService>(() => StripeService());
+
+  getIt.registerLazySingleton<Stripe>(() => Stripe.instance);
+
+  getIt.registerLazySingleton<MachineCommunicationService>(
+        () => MachineCommunicator(
+      edgeFunctionService: getIt<EdgeFunctionService>(),
+    ),
+  );
+
+  getIt.registerLazySingleton<RouterService>(() => RouterService());
+
+  getIt.registerLazySingleton<NotificationService>(
+        () => NotificationService(),
+  );
+
+  getIt.registerSingleton<FlutterLocalNotificationsPlugin>(
+    FlutterLocalNotificationsPlugin(),
+  );
+
+  getIt.registerLazySingleton<PaymentProcessor>(
+        () => PaymentProcessor(),
+  );
+
+  getIt.registerLazySingleton<GoRouter>(() {
+    final authService = getIt<AuthService>();
+    final routerService = getIt<RouterService>();
+
+    return routerService.createRouter(authService);
+  });
+}

lib/middleware/app_router.dart → lib/core/router/app_router.dart

@@ -1,24 +1,24 @@
 import 'package:app_links/app_links.dart';
-import 'package:clean_stream_laundry_app/pages/change_email_verification.dart';
-import 'package:clean_stream_laundry_app/pages/edit_profile_page.dart';
-import 'package:clean_stream_laundry_app/pages/verify_code_page.dart';
-import 'package:go_router/go_router.dart';
+import 'package:clean_stream_laundry_app/features/change_email_verification/change_email_verification.dart';
+import 'package:clean_stream_laundry_app/features/edit_profile/edit_profile.dart';
+import 'package:clean_stream_laundry_app/features/verify_code/verify_code.dart';
+import 'package:clean_stream_laundry_app/features/email_verification/email_verification.dart';
+import 'package:clean_stream_laundry_app/features/home/home.dart';
+import 'package:clean_stream_laundry_app/features/loading/loading.dart';
+import 'package:clean_stream_laundry_app/features/loyalty/loyalty.dart';
+import 'package:clean_stream_laundry_app/features/scanner/scanner.dart';
+import 'package:clean_stream_laundry_app/features/sign_up/sign_up.dart';
+import 'package:clean_stream_laundry_app/features/login/login.dart';
+import 'package:clean_stream_laundry_app/features/not_found/not_found.dart';
+import 'package:clean_stream_laundry_app/features/settings/settings.dart';
+import 'package:clean_stream_laundry_app/features/start_machine/start_machine.dart';
+import 'package:clean_stream_laundry_app/features/machine_payment/machine_payment.dart';
+import 'package:clean_stream_laundry_app/features/monthly_report/monthly_report.dart';
+import 'package:clean_stream_laundry_app/features/refund_request/refund_request.dart';
+import 'package:clean_stream_laundry_app/features/password_reset/password_reset.dart';
+import 'package:clean_stream_laundry_app/features/reset_protected/reset_protected.dart';
 import 'package:clean_stream_laundry_app/logic/services/auth_service.dart';
-import 'package:clean_stream_laundry_app/pages/email_verification_page.dart';
-import 'package:clean_stream_laundry_app/pages/home_page.dart';
-import 'package:clean_stream_laundry_app/pages/loading_page.dart';
-import 'package:clean_stream_laundry_app/pages/loyalty_card_page.dart';
-import 'package:clean_stream_laundry_app/pages/scanner_widget.dart';
-import 'package:clean_stream_laundry_app/pages/sign_up_screen.dart';
-import 'package:clean_stream_laundry_app/pages/login_page.dart';
-import 'package:clean_stream_laundry_app/pages/not_found_page.dart';
-import 'package:clean_stream_laundry_app/pages/settings.dart';
-import 'package:clean_stream_laundry_app/pages/start_machine_page.dart';
-import 'package:clean_stream_laundry_app/pages/payment_page.dart';
-import 'package:clean_stream_laundry_app/pages/monthly_transaction_history.dart';
-import 'package:clean_stream_laundry_app/pages/refund_page.dart';
-import 'package:clean_stream_laundry_app/pages/password_reset.dart';
-import 'package:clean_stream_laundry_app/pages/reset_protected_page.dart';
+import 'package:go_router/go_router.dart';
 
 class RouterService {
   GoRouter createRouter(AuthService authenticator) => GoRouter(
@@ -28,7 +28,7 @@ class RouterService {
         path: '/login',
         pageBuilder: (context, state) => CustomTransitionPage(
           key: state.pageKey,
-          child: LoginScreen(appLinks: AppLinks()),
+          child: Login(appLinks: AppLinks()),
           transitionDuration: Duration.zero,
           reverseTransitionDuration: Duration.zero,
           transitionsBuilder: (_, _, _, child) => child,
@@ -38,7 +38,7 @@ class RouterService {
         path: '/signup',
         pageBuilder: (context, state) => CustomTransitionPage(
           key: state.pageKey,
-          child: SignUpScreen(),
+          child: SignUpPage(),
           transitionDuration: Duration.zero,
           reverseTransitionDuration: Duration.zero,
           transitionsBuilder: (_, _, _, child) => child,
@@ -48,7 +48,7 @@ class RouterService {
         path: '/scanner',
         pageBuilder: (context, state) => CustomTransitionPage(
           key: state.pageKey,
-          child: ScannerWidget(),
+          child: ScannerPage(),
           transitionDuration: Duration.zero,
           reverseTransitionDuration: Duration.zero,
           transitionsBuilder: (_, _, _, child) => child,
@@ -81,7 +81,7 @@ class RouterService {
           final machineId = state.uri.queryParameters['machineId'] ?? '';
           return CustomTransitionPage(
             key: state.pageKey,
-            child: PaymentPage(machineId: machineId),
+            child: MachinePayment(machineId: machineId),
             transitionDuration: Duration.zero,
             reverseTransitionDuration: Duration.zero,
             transitionsBuilder: (_, _, _, child) => child,
@@ -134,7 +134,7 @@ class RouterService {
           final transactions = state.extra as List<Map<String, dynamic>>? ?? [];
           return CustomTransitionPage(
             key: state.pageKey,
-            child: MonthlyTransactionHistory(transactions: transactions),
+            child: MonthlyReport(transactions: transactions),
             transitionDuration: Duration.zero,
             reverseTransitionDuration: Duration.zero,
             transitionsBuilder: (_, _, _, child) => child,
@@ -202,7 +202,7 @@ class RouterService {
       if (uri.scheme == 'clean-stream' && uri.host == 'reset-protected') {
         return ResetProtectedPage();
       }
-      return const NotFoundScreen();
+      return const NotFound();
     },
     redirect: (context, state) {
       final uri = state.uri;

lib/logic/theme/theme_manager.dart → lib/core/theme/theme_manager.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:clean_stream_laundry_app/logic/theme/theme.dart';
-import 'package:clean_stream_laundry_app/middleware/storage_service.dart';
+import 'package:clean_stream_laundry_app/core/theme/theme.dart';
+import 'package:clean_stream_laundry_app/core/storage/storage_service.dart';
 
 class ThemeManager with ChangeNotifier {
   ThemeData _themeData = lightMode;

lib/features/change_email_verification/change_email_verification.dart

@@ -0,0 +1,81 @@
+import 'package:clean_stream_laundry_app/core/theme/theme.dart';
+import 'package:flutter/material.dart';
+import 'package:app_links/app_links.dart';
+import 'controller.dart';
+import 'widgets/resend_verification.dart';
+
+class ChangeEmailVerificationPage extends StatefulWidget {
+  final AppLinks appLinks;
+
+  const ChangeEmailVerificationPage({super.key, required this.appLinks});
+
+  @override
+  State<ChangeEmailVerificationPage> createState() =>
+      _ChangeEmailVerificationPageState();
+}
+
+class _ChangeEmailVerificationPageState
+    extends State<ChangeEmailVerificationPage> {
+  late final ChangeEmailVerificationController _controller;
+
+  @override
+  void initState() {
+    super.initState();
+    _controller = ChangeEmailVerificationController(
+      appLinks: widget.appLinks,
+      context: context,
+    );
+    _controller.init();
+  }
+
+  @override
+  void dispose() {
+    _controller.dispose();
+    super.dispose();
+  }
+
+  void _refresh() {
+    setState(() {});
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      backgroundColor: Theme.of(context).colorScheme.surface,
+      body: Center(
+        child: Padding(
+          padding: const EdgeInsets.all(24.0),
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              const Icon(Icons.email, size: 80, color: Colors.blueAccent),
+              const SizedBox(height: 24),
+              Text(
+                'Please verify your new email address',
+                textAlign: TextAlign.center,
+                style: TextStyle(
+                  fontSize: 18,
+                  color: Theme.of(context).colorScheme.fontInverted,
+                ),
+              ),
+              const SizedBox(height: 16),
+              Text(
+                'Check your new email\'s inbox and click the verification link.',
+                textAlign: TextAlign.center,
+                style: TextStyle(
+                  fontSize: 16,
+                  color: Theme.of(context).colorScheme.fontSecondary,
+                ),
+              ),
+              const SizedBox(height: 24),
+              ResendVerificationWidget(
+                controller: _controller,
+                onStateChange: _refresh,
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/features/change_email_verification/controller.dart

@@ -0,0 +1,60 @@
+import 'dart:async';
+import 'package:flutter/material.dart';
+import 'package:clean_stream_laundry_app/logic/enums/authentication_response_enum.dart';
+import 'package:clean_stream_laundry_app/logic/services/auth_service.dart';
+import 'package:get_it/get_it.dart';
+import 'package:go_router/go_router.dart';
+import 'package:app_links/app_links.dart';
+
+class ChangeEmailVerificationController {
+  final AuthService _authService = GetIt.instance<AuthService>();
+  final AppLinks appLinks;
+  final BuildContext context;
+
+  StreamSubscription? _linkSub;
+
+  bool resent = false;
+  bool isLoading = false;
+  AuthenticationResponses? lastResponse;
+
+  ChangeEmailVerificationController({
+    required this.appLinks,
+    required this.context,
+  });
+
+  void init() {
+    _linkSub = appLinks.uriLinkStream.listen(_handleUri);
+  }
+
+  void dispose() {
+    _linkSub?.cancel();
+  }
+
+  /// Handles deeplink from email
+  Future<void> _handleUri(Uri? uri) async {
+    if (uri != null &&
+        uri.scheme == 'clean-stream' &&
+        uri.host == 'change-email') {
+      await _authService.refreshSession();
+      await _authService.getCurrentUser();
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        if (context.mounted) {
+          context.go('/editProfile');
+        }
+      });
+    }
+  }
+
+  /// Resends verification email
+  Future<void> resendVerification() async {
+    if (resent) return;
+
+    isLoading = true;
+    lastResponse = await _authService.resendVerification();
+    isLoading = false;
+
+    if (lastResponse == AuthenticationResponses.success) {
+      resent = true;
+    }
+  }
+}