Merge branches 'main' and 'main' of github.com:bulgariamitko/flutterf…

…lowtutorials
bulgariamitko · Jan 2, 2025 · f6b2b6e · f6b2b6e
2 parents 95ba378 + 8135307
commit f6b2b6e
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 1 deletion.
diff --git a/Source-Code/ff_source_code/lib/backend/supabase/supabase.dart b/Source-Code/ff_source_code/lib/backend/supabase/supabase.dart
@@ -21,5 +21,7 @@ class SupaFlow {
         url: _kSupabaseUrl,
         anonKey: _kSupabaseAnonKey,
         debug: false,
+        authOptions:
+            FlutterAuthClientOptions(authFlowType: AuthFlowType.implicit),
       );
 }
diff --git a/Source-Code/ff_source_code/lib/flutter_flow/flutter_flow_util.dart b/Source-Code/ff_source_code/lib/flutter_flow/flutter_flow_util.dart
@@ -30,7 +30,7 @@ export 'package:cloud_firestore/cloud_firestore.dart'
 export 'package:page_transition/page_transition.dart';
 export 'nav/nav.dart';
 
-final RouteObserver<ModalRoute> routeObserver = RouteObserver<PageRoute>();
+final RouteObserver<ModalRoute> routeObserver = RouteObserver<ModalRoute>();
 
 T valueOrDefault<T>(T? value, T defaultValue) =>
     (value is String && value.isEmpty) || value == null ? defaultValue : value;

diff --git a/Source-Code/ff_source_code/lib/flutter_flow/nav/nav.dart b/Source-Code/ff_source_code/lib/flutter_flow/nav/nav.dart
@@ -25,6 +25,8 @@ export 'serialization_util.dart';
 
 const kTransitionInfoKey = '__transition_info__';
 
+GlobalKey<NavigatorState> appNavigatorKey = GlobalKey<NavigatorState>();
+
 class AppStateNotifier extends ChangeNotifier {
   AppStateNotifier._();
 
@@ -82,6 +84,7 @@ GoRouter createRouter(AppStateNotifier appStateNotifier) => GoRouter(
       initialLocation: '/',
       debugLogDiagnostics: true,
       refreshListenable: appStateNotifier,
+      navigatorKey: appNavigatorKey,
       errorBuilder: (context, state) =>
           appStateNotifier.loggedIn ? LoginWidget() : HomePageWidget(),
       routes: [

diff --git a/Source-Code/ff_source_code/lib/pages/home_page/home_page_model.dart b/Source-Code/ff_source_code/lib/pages/home_page/home_page_model.dart
@@ -4,6 +4,7 @@ import '/flutter_flow/flutter_flow_util.dart';
 import '/flutter_flow/flutter_flow_video_player.dart';
 import '/flutter_flow/flutter_flow_widgets.dart';
 import '/flutter_flow/upload_data.dart';
+import 'dart:ui';
 import 'home_page_widget.dart' show HomePageWidget;
 import 'package:flutter/material.dart';
 import 'package:google_fonts/google_fonts.dart';

diff --git a/Source-Code/ff_source_code/lib/pages/home_page/home_page_widget.dart b/Source-Code/ff_source_code/lib/pages/home_page/home_page_widget.dart
@@ -4,6 +4,7 @@ import '/flutter_flow/flutter_flow_util.dart';
 import '/flutter_flow/flutter_flow_video_player.dart';
 import '/flutter_flow/flutter_flow_widgets.dart';
 import '/flutter_flow/upload_data.dart';
+import 'dart:ui';
 import 'package:flutter/material.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:provider/provider.dart';

diff --git a/Source-Code/ff_source_code/lib/pages/login/login_model.dart b/Source-Code/ff_source_code/lib/pages/login/login_model.dart
@@ -1,6 +1,7 @@
 import '/flutter_flow/flutter_flow_theme.dart';
 import '/flutter_flow/flutter_flow_util.dart';
 import '/flutter_flow/flutter_flow_widgets.dart';
+import 'dart:ui';
 import 'login_widget.dart' show LoginWidget;
 import 'package:flutter/material.dart';
 import 'package:google_fonts/google_fonts.dart';

diff --git a/Source-Code/ff_source_code/lib/pages/login/login_widget.dart b/Source-Code/ff_source_code/lib/pages/login/login_widget.dart
@@ -1,6 +1,7 @@
 import '/flutter_flow/flutter_flow_theme.dart';
 import '/flutter_flow/flutter_flow_util.dart';
 import '/flutter_flow/flutter_flow_widgets.dart';
+import 'dart:ui';
 import 'package:flutter/material.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:provider/provider.dart';