diff --git a/frontend/lib/features/auth/presentation/approve_qr_screen.dart b/frontend/lib/features/auth/presentation/approve_qr_screen.dart index 2b4d2d5a..2422f006 100644 --- a/frontend/lib/features/auth/presentation/approve_qr_screen.dart +++ b/frontend/lib/features/auth/presentation/approve_qr_screen.dart @@ -22,7 +22,7 @@ class _ApproveQrScreenState extends State { final session = Descope.sessionManager.session; if (session == null || session.refreshToken.isExpired) { setState(() => _message = "Please log in on your phone first."); - context.go('/login'); // Redirect to login + context.go('/signin'); // Redirect to login return; } @@ -103,7 +103,7 @@ class _ApproveQrScreenState extends State { Padding( padding: const EdgeInsets.only(top: 16), child: TextButton( - onPressed: () => context.go('/login'), + onPressed: () => context.go('/signin'), child: const Text("Login on this device first"), ), ), diff --git a/frontend/lib/features/auth/presentation/reset_password_screen.dart b/frontend/lib/features/auth/presentation/reset_password_screen.dart index e396bc5b..ae29d76b 100644 --- a/frontend/lib/features/auth/presentation/reset_password_screen.dart +++ b/frontend/lib/features/auth/presentation/reset_password_screen.dart @@ -87,7 +87,7 @@ class _ResetPasswordScreenState extends State { backgroundColor: Colors.green, ), ); - context.go('/login'); + context.go('/signin'); } } catch (e) { if (mounted) { diff --git a/frontend/lib/features/auth/presentation/signup_screen.dart b/frontend/lib/features/auth/presentation/signup_screen.dart index 757b85c9..bf705a41 100644 --- a/frontend/lib/features/auth/presentation/signup_screen.dart +++ b/frontend/lib/features/auth/presentation/signup_screen.dart @@ -257,7 +257,7 @@ class _SignupScreenState extends State { builder: (context) => AlertDialog( title: const Text('회원가입 완료'), content: const Text('성공적으로 가입되었습니다.'), - actions: [TextButton(onPressed: () => context.go('/login'), child: const Text('로그인하기'))], + actions: [TextButton(onPressed: () => context.go('/signin'), child: const Text('로그인하기'))], ), ); } diff --git a/frontend/lib/main.dart b/frontend/lib/main.dart index 8c2d27a4..09c8e693 100644 --- a/frontend/lib/main.dart +++ b/frontend/lib/main.dart @@ -92,9 +92,9 @@ final _router = GoRouter( ], ), GoRoute( - path: '/login', + path: '/signin', builder: (context, state) { - _routerLogger.info("Navigating to /login"); + _routerLogger.info("Navigating to /signin"); return const LoginScreen(); } ), @@ -159,7 +159,7 @@ final _router = GoRouter( final path = state.uri.path; // Public paths that don't require login - final isPublicPath = path == '/login' || + final isPublicPath = path == '/signin' || path == '/signup' || path.startsWith('/verify/') || path == '/approve' || @@ -173,15 +173,15 @@ final _router = GoRouter( return null; } - // If not logged in and trying to access a protected page, redirect to /login + // If not logged in and trying to access a protected page, redirect to /signin if (!isLoggedIn) { - _routerLogger.info("Not logged in, redirecting to /login"); - return '/login'; + _routerLogger.info("Not logged in, redirecting to /signin"); + return '/signin'; } // If logged in and trying to access login page, redirect to root (dashboard) // This is now implicitly handled by the isPublicPath check, but kept for clarity. - // if (isLoggedIn && path == '/login') { + // if (isLoggedIn && path == '/signin') { // _routerLogger.info("Logged in, redirecting to /"); // return '/'; // }