completed first web iteration

lib/main.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:go_router/go_router.dart';
+import 'package:qpay/navbar.dart';
 import 'package:qpay/screens/confirm/confirm_screen.dart';
 import 'package:qpay/screens/gateway/gateway_screen.dart';
 import 'package:qpay/screens/integration/integration_screen.dart';
@@ -13,9 +14,11 @@ import 'package:qpay/screens/onboarding/phone/phone_screen.dart';
 import 'package:qpay/screens/onboarding/register/register_screen.dart';
 import 'package:qpay/screens/onboarding/verify/verify_screen.dart';
 import 'package:qpay/screens/pay/pay_screen.dart';
+import 'package:qpay/screens/poll/poll_screen.dart';
 import 'package:qpay/screens/receipt/receipt_screen.dart';
 import 'package:qpay/screens/recipient/recipients_screen.dart';
 import 'package:qpay/screens/transaction_controller.dart';
+import 'screens/gateway/gateway_web_screen.dart';
 import 'screens/home/home_screen.dart';
 import 'screens/history/history_screen.dart';
 import 'screens/profile_screen.dart';
@@ -66,7 +69,7 @@ class _MyAppState extends State<MyApp> {
   Widget build(BuildContext context) {
     if (_showSplash) {
       return MaterialApp(
-        title: 'Peak',
+        title: 'Velocity',
         theme: AppTheme.lightTheme,
         themeMode: ThemeMode.light,
         home: SplashScreen(onSplashComplete: _onSplashComplete),
@@ -75,7 +78,7 @@ class _MyAppState extends State<MyApp> {
     }
 
     return MaterialApp.router(
-      title: 'Peak',
+      title: 'Velocity',
       theme: AppTheme.lightTheme,
       themeMode: ThemeMode.light, // Force light mode regardless of OS setting
       debugShowCheckedModeBanner: false,
@@ -112,6 +115,14 @@ class _MyAppState extends State<MyApp> {
                 path: '/gateway',
                 builder: (context, state) => const GatewayScreen(),
               ),
+              GoRoute(
+                path: '/gateway-web',
+                builder: (context, state) => const GatewayWebScreen(),
+              ),
+              GoRoute(
+                path: '/poll',
+                builder: (context, state) => const PollScreen(),
+              ),
               GoRoute(
                 path: '/receipt',
                 builder: (context, state) => const ReceiptScreen(),
@@ -167,65 +178,3 @@ class _MyAppState extends State<MyApp> {
     );
   }
 }
-
-class ScaffoldWithNavBar extends StatelessWidget {
-  const ScaffoldWithNavBar({super.key, required this.child});
-
-  final Widget child;
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      body: child,
-      bottomNavigationBar: NavigationBar(
-        onDestinationSelected: (index) {
-          switch (index) {
-            case 0:
-              context.go('/home');
-              break;
-            // case 1:
-            //   context.go('/recipients');
-            //   break;
-            case 1:
-              context.go('/history');
-              break;
-            // case 2:
-            //   context.go('/profile');
-            //   break;
-          }
-        },
-        selectedIndex: _calculateSelectedIndex(context),
-        destinations: const [
-          NavigationDestination(
-            icon: Icon(Icons.home_outlined),
-            selectedIcon: Icon(Icons.home),
-            label: 'Home',
-          ),
-          // NavigationDestination(
-          //   icon: Icon(Icons.contacts_outlined),
-          //   selectedIcon: Icon(Icons.contacts),
-          //   label: 'Recipients',
-          // ),
-          NavigationDestination(
-            icon: Icon(Icons.history_outlined),
-            selectedIcon: Icon(Icons.history),
-            label: 'History',
-          ),
-          // NavigationDestination(
-          //   icon: Icon(Icons.person_outline),
-          //   selectedIcon: Icon(Icons.person),
-          //   label: 'Profile',
-          // ),
-        ],
-      ),
-    );
-  }
-
-  int _calculateSelectedIndex(BuildContext context) {
-    final String location = GoRouterState.of(context).uri.path;
-    // if (location.startsWith('/recipients')) return 1;
-    if (location.startsWith('/history')) return 1;
-    // if (location.startsWith('/profile')) return 2;
-    return 0;
-  }
-}