Merge pull request #146 from PDG-NUTRI/145-fix-guards

145 fix guards

Author: chloefont

lib/main.dart

@@ -22,6 +22,7 @@ Future<void> setup() async {
       clientApi: FirebaseUser(FirebaseFirestore.instance),
     ),
   );
+  await GetIt.I.get<AuthProvider>().init();
 }
 
 void main() async {

lib/provider/auth_provider.dart

@@ -17,6 +17,17 @@ class AuthProvider extends ChangeNotifier {
       : _auth = auth,
         _userApi = clientApi;
 
+  Future<void> init() async {
+    if (isConnected()) {
+      final values = await Future.wait([
+        fetchClient(),
+        _auth.isDietitian(),
+      ]);
+
+      _isAdmin = values[1] as bool;
+    }
+  }
+
   bool get isAdmin => _isAdmin;
 
   User? get user => _client;
@@ -28,12 +39,12 @@ class AuthProvider extends ChangeNotifier {
   }
 
   Future<void> signIn(String email, String password) async {
-    //final isConnected = await _auth.signIn(email: email, password: password);
-    final isConnected =
-        await _auth.signIn(email: "[email protected]", password: 'crepes');
+    final isConnected = await _auth.signIn(email: email, password: password);
+    //final isConnected =
+    //await _auth.signIn(email: "[email protected]", password: 'crepes');
     _isAdmin = await _auth.isDietitian();
     if (isConnected) {
-      fetchClient();
+      await fetchClient();
     }
 
     notifyListeners();

lib/router/router.dart

@@ -29,10 +29,6 @@ import 'home_guard.dart';
       guards: [AuthGuard],
       initial: true,
       children: [
-        RedirectRoute(
-          path: '',
-          redirectTo: 'diary',
-        ),
         AutoRoute(
           page: EmptyRouterPage,
           name: 'ChatRouterPage',
@@ -57,6 +53,7 @@ import 'home_guard.dart';
         AutoRoute(
           page: EmptyRouterPage,
           name: "MainRouterPage",
+          initial: true,
           path: 'main',
           children: [
             AutoRoute(

lib/router/router.gr.dart

@@ -141,7 +141,7 @@ class AppRouter extends _i16.RootStackRouter {
           _i16.RouteConfig('#redirect',
               path: '',
               parent: HomeScreenRoute.name,
-              redirectTo: 'diary',
+              redirectTo: 'main',
               fullMatch: true),
           _i16.RouteConfig(ChatRouterPage.name,
               path: 'chat',

lib/screens/login.dart

@@ -38,7 +38,7 @@ class _LoginScreenState extends State<LoginScreen> {
           await auth.signIn(_emailController.text, _passwordController.text);
           if (auth.isConnected()) {
             // ignore: use_build_context_synchronously
-            AutoRouter.of(context).navigate(const HomeScreenRoute());
+            AutoRouter.of(context).replaceAll([const HomeScreenRoute()]);
           } else {
             // ignore: use_build_context_synchronously
             ScaffoldMessenger.of(context).showSnackBar(

lib/screens/profile.dart

@@ -24,7 +24,9 @@ class ProfileScreen extends StatelessWidget {
       clientInsurance: "09734789789248943",
       onLogoutPressed: () {
         GetIt.I.get<AuthProvider>().signOut();
-        AutoRouter.of(context).navigate(const LoginScreenRoute());
+        context.router.replaceAll([
+          const LoginScreenRoute(),
+        ]);
       },
     );
   }

lib/screens/register.dart

@@ -5,31 +5,24 @@ import 'package:pdg_app/widgets/register/top_shape.dart';
 import 'package:pdg_app/widgets/register/bottom_shape.dart';
 import 'package:provider/provider.dart';
 
-import '../router/router.gr.dart';
-
 class RegisterScreen extends StatelessWidget {
   const RegisterScreen({Key? key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
-      body: Register(
-        onRegisterPress: () =>
-            AutoRouter.of(context).navigate(const RegisterScreenRoute()),
-      ),
+    return const Scaffold(
+      body: Register(),
     );
 
     /// Navigating to the RegisterScreenRoute.
   }
 }
 
 class Register extends StatelessWidget {
-  final void Function()? onRegisterPress;
   final double screenWidth;
 
   const Register({
     this.screenWidth = 0,
-    this.onRegisterPress,
     Key? key,
   }) : super(key: key);
 

lib/widgets/register/register_third_page.dart

@@ -47,7 +47,7 @@ class _RegisterThirdPageState extends State<RegisterThirdPage> {
                         registerProvider.createUser(),
                       );
 
-                  router.push(const HomeScreenRoute());
+                  router.replaceAll([const HomeScreenRoute()]);
                 }),
           ),
         ],

pubspec.lock

@@ -28,7 +28,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.9.0"
+    version: "2.8.2"
   auto_route:
     dependency: "direct main"
     description:
@@ -112,7 +112,14 @@ packages:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.1"
+    version: "1.2.0"
+  charcode:
+    dependency: transitive
+    description:
+      name: charcode
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.3.1"
   checked_yaml:
     dependency: transitive
     description:
@@ -126,7 +133,7 @@ packages:
       name: clock
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.0"
   cloud_firestore:
     dependency: "direct main"
     description:
@@ -245,7 +252,7 @@ packages:
       name: fake_async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.1"
+    version: "1.3.0"
   fake_cloud_firestore:
     dependency: "direct dev"
     description:
@@ -596,21 +603,21 @@ packages:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.12"
+    version: "0.12.11"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.5"
+    version: "0.1.4"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0"
+    version: "1.7.0"
   mime:
     dependency: transitive
     description:
@@ -638,7 +645,7 @@ packages:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.2"
+    version: "1.8.1"
   path_provider:
     dependency: "direct main"
     description:
@@ -804,7 +811,7 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.9.0"
+    version: "1.8.2"
   stack_trace:
     dependency: transitive
     description:
@@ -832,7 +839,7 @@ packages:
       name: string_scanner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.0"
   table_calendar:
     dependency: "direct main"
     description:
@@ -846,14 +853,14 @@ packages:
       name: term_glyph
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.1"
+    version: "1.2.0"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.12"
+    version: "0.4.9"
   timing:
     dependency: transitive
     description: