Merge pull request #14 from jnnabugwu/dev

fix: fixing deployment

Author: jnnabugwu

lib/core/config/supabase_config.dart

@@ -2,58 +2,38 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:supabase_flutter/supabase_flutter.dart';
 import 'dart:js' as js;
+import '../../utils/environment.dart';
 
 class SupabaseConfig {
   static String get supabaseUrl {
     try {
-      if (kIsWeb) {
-        if (js.context['ENV'] == null) {
-          debugPrint('❌ ERROR: window.ENV is not defined! Check if config.js is loaded');
-          throw Exception('window.ENV is not defined');
-        }
-        final env = js.context['ENV'];
-        if (env['SUPABASE_URL'] == null) {
-          debugPrint('❌ ERROR: SUPABASE_URL not found in window.ENV');
-          throw Exception('SUPABASE_URL not found in config');
-        }
-        final url = env['SUPABASE_URL'] as String;
-        debugPrint('✅ Loaded Supabase URL from web config: $url');
-        return url;
-      }
-      return dotenv.env['SUPABASE_URL'] ?? '';
+      // Use our Environment utility class that has fallbacks
+      return Environment.supabaseUrl;
     } catch (e) {
       debugPrint('❌ Error getting Supabase URL: $e');
-      rethrow;
+      // Return fallback directly here as a last resort
+      return 'https://kszcjniwbqxyndpsajhr.supabase.co/';
     }
   }
 
   static String get supabaseAnonKey {
     try {
-      if (kIsWeb) {
-        if (js.context['ENV'] == null) {
-          debugPrint('❌ ERROR: window.ENV is not defined! Check if config.js is loaded');
-          throw Exception('window.ENV is not defined');
-        }
-        final env = js.context['ENV'];
-        if (env['SUPABASE_ANON_KEY'] == null) {
-          debugPrint('❌ ERROR: SUPABASE_ANON_KEY not found in window.ENV');
-          throw Exception('SUPABASE_ANON_KEY not found in config');
-        }
-        final key = env['SUPABASE_ANON_KEY'] as String;
-        debugPrint('✅ Loaded Supabase Anon Key from web config');
-        return key;
-      }
-      return dotenv.env['SUPABASE_ANON_KEY'] ?? '';
+      // Use our Environment utility class that has fallbacks
+      return Environment.supabaseAnonKey;
     } catch (e) {
       debugPrint('❌ Error getting Supabase Anon Key: $e');
-      rethrow;
+      // Return fallback directly here as a last resort
+      return 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6ImtzemNqbml3YnF4eW5kcHNhamhyIiwicm9sZSI6ImFub24iLCJpYXQiOjE3NDM2NTEzNjQsImV4cCI6MjA1OTIyNzM2NH0.UnN4xuo783XDrR5nQTlwZAIcW6DqrbFY3bo4nssOvu4';
     }
   }
 
   static Future<void> initialize() async {
     try {
       if (!kIsWeb) {
-        await dotenv.load();
+        await dotenv.load().catchError((e) {
+          debugPrint('⚠️ Warning: Could not load .env file: $e');
+          debugPrint('Using fallback values instead');
+        });
       }
 
       final url = supabaseUrl;
@@ -63,18 +43,22 @@ class SupabaseConfig {
       debugPrint('📍 URL Length: ${url.length}');
       debugPrint('🔑 Key Length: ${key.length}');
 
+      if (url.isEmpty || key.isEmpty) {
+        throw AssertionError('Supabase URL or Anon Key is empty. Check your configuration.');
+      }
+      
       await Supabase.initialize(
         url: url,
         anonKey: key,
-        debug: true,
+        debug: kDebugMode,
       );
 
       // Test the connection
       final client = Supabase.instance.client;
       debugPrint('🔍 Testing connection...');
       try {
         // Simple test query that should always work
-        await client.from('_dummy_test').select().limit(1);
+        await client.from('athletes').select('id').limit(1);
         debugPrint('✅ Connection test successful!');
       } catch (e) {
         debugPrint('⚠️ Connection test failed: $e');

lib/main.dart

@@ -3,49 +3,86 @@ import 'package:flutter/material.dart';
 import 'package:supabase_flutter/supabase_flutter.dart';
 import 'package:athlete_alumni/core/di/injection.dart' as di;
 import 'package:athlete_alumni/core/router/app_router.dart';
-import 'package:flutter_dotenv/flutter_dotenv.dart';
+import 'package:athlete_alumni/utils/environment.dart';
+import 'package:athlete_alumni/core/config/supabase_config.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
 
-  // Load .env file first
   try {
-    await dotenv.load(fileName: ".env");
-    print('✅ Loaded .env file successfully');
-    
-    // Get and log Supabase configuration (without the actual key)
-    final supabaseUrl = dotenv.get('SUPABASE_URL');
-    print('🔍 Supabase URL configured as: $supabaseUrl');
+    // Initialize environment variables first
+    await Environment.initialize();
+    if (kDebugMode) {
+      print('✅ Environment initialized successfully');
+      
+      // Get and log Supabase configuration
+      final supabaseUrl = Environment.supabaseUrl;
+      print('🔍 Supabase URL configured as: $supabaseUrl');
+      print('🔍 URL length: ${supabaseUrl.length}');
+    }
 
-    // Initialize Supabase
-    await Supabase.initialize(
-      url: supabaseUrl,
-      anonKey: dotenv.get('SUPABASE_ANON_KEY'),
-    );
-    print('✅ Supabase initialized successfully');
+    // Initialize Supabase using our config
+    await SupabaseConfig.initialize();
+    if (kDebugMode) {
+      print('✅ Supabase initialized successfully');
+    }
 
     // Initialize dependency injection
     await di.init();
-    print('✅ Dependency injection initialized');
+    if (kDebugMode) {
+      print('✅ Dependency injection initialized');
+    }
 
     runApp(const MyApp());
 
-  } catch (e) {
-    print('❌ Error during initialization:');
-    print('Error type: ${e.runtimeType}');
-    print('Error details: $e');
-    
-    if (e is Error) {
-      print('Stack trace: ${e.stackTrace}');
+  } catch (e, stackTrace) {
+    if (kDebugMode) {
+      print('❌ Error during initialization:');
+      print('Error type: ${e.runtimeType}');
+      print('Error details: $e');
+      print('Stack trace: $stackTrace');
     }
 
     // Show error UI instead of crashing
     runApp(MaterialApp(
       home: Scaffold(
         body: Center(
-          child: Text(
-            'Error initializing app: ${e.toString()}',
-            style: const TextStyle(color: Colors.red),
+          child: Padding(
+            padding: const EdgeInsets.all(20.0),
+            child: Column(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                const Icon(
+                  Icons.error_outline,
+                  color: Colors.red,
+                  size: 60,
+                ),
+                const SizedBox(height: 20),
+                Text(
+                  'Error initializing app:',
+                  style: const TextStyle(
+                    color: Colors.red,
+                    fontSize: 18,
+                    fontWeight: FontWeight.bold,
+                  ),
+                ),
+                const SizedBox(height: 10),
+                Text(
+                  e.toString(),
+                  style: const TextStyle(color: Colors.red),
+                  textAlign: TextAlign.center,
+                ),
+                const SizedBox(height: 30),
+                ElevatedButton(
+                  onPressed: () {
+                    // This is a simple restart attempt
+                    // In a real app, you'd want a more robust solution
+                    main();
+                  },
+                  child: const Text('Try Again'),
+                ),
+              ],
+            ),
           ),
         ),
       ),