1- import 'package:app/main/init.dart' ;
21import 'package:app/presentation/ui/pages/home/home_page.dart' ;
32import 'package:app/presentation/ui/pages/login/login_page.dart' ;
43import 'package:app/presentation/ui/pages/sign_up/sign_up_page.dart' ;
@@ -12,7 +11,7 @@ import 'package:go_router/go_router.dart';
1211enum Routes {
1312 auth,
1413 login,
15- signUp ,
14+ signup ,
1615 app,
1716 home;
1817
@@ -37,6 +36,7 @@ class Routers {
3736 path: '/' ,
3837 builder: (context, state) {
3938 return BlocListener <AuthCubit , Resource >(
39+ listenWhen: (previous, current) => current is RSuccess ,
4040 listener: (_, state) {
4141 if (state is RSuccess ) {
4242 switch (state.data) {
@@ -58,11 +58,12 @@ class Routers {
5858 name: Routes .auth.name,
5959 path: Routes .auth.path,
6060 redirect: (context, state) {
61- if (getIt <AuthCubit >().isLoggedIn ()) {
61+ if (context. read <AuthCubit >().isLoggedIn ()) {
6262 return '${Routes .app .path }${Routes .home .path }' ;
6363 }
6464
65- return '${Routes .auth .path }${Routes .login .path }' ;
65+ /// Continue to auth routes
66+ return null ;
6667 },
6768 routes: [
6869 GoRoute (
@@ -71,22 +72,22 @@ class Routers {
7172 builder: (context, state) => const LoginPage (),
7273 ),
7374 GoRoute (
74- name: Routes .signUp .name,
75- path: Routes .signUp .subPath,
75+ name: Routes .signup .name,
76+ path: Routes .signup .subPath,
7677 builder: (context, state) => const SignUpPage (),
7778 ),
7879 ],
7980 ),
8081 GoRoute (
8182 name: Routes .app.name,
8283 path: Routes .app.path,
83- builder: (context, state) => const SplashPage (),
8484 redirect: (context, state) {
85- if (! getIt <AuthCubit >().isLoggedIn ()) {
85+ if (! context. read <AuthCubit >().isLoggedIn ()) {
8686 return '${Routes .auth .path }${Routes .login .path }' ;
8787 }
8888
89- return '${Routes .app .path }${Routes .home .path }' ;
89+ /// Continue to app routes
90+ return null ;
9091 },
9192 routes: [
9293 GoRoute (
0 commit comments