share link completed

2025-03-05 11:47:15 +05:30 · 2025-03-05 11:47:15 +05:30 · e01855c0cd
commit e01855c0cd
parent f317685f5d
8 changed files with 75 additions and 71 deletions
--- a/android/app/.cxx/Debug/6q3k463w/arm64-v8a/configure_fingerprint.bin
+++ b/android/app/.cxx/Debug/6q3k463w/arm64-v8a/configure_fingerprint.bin
@ -2,27 +2,27 @@ C/C++ Structured Loge
 c
 aC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\arm64-v8a\additional_project_files.txtC
 A
-?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	í³³áÕ2 áÿÛ®Ô2b
+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	»’’¦Ö2 áÿÛ®Ô2b
 `
-^C:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\arm64-v8a\android_gradle_build.json	í³³áÕ2¾ éÿÛ®Ô2g
+^C:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\arm64-v8a\android_gradle_build.json	»’’¦Ö2¾ éÿÛ®Ô2g
 e
-cC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\arm64-v8a\android_gradle_build_mini.json	í³³áÕ2‘ „€Ü®Ô2T
+cC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\arm64-v8a\android_gradle_build_mini.json	»’’¦Ö2‘ „€Ü®Ô2T
 R
-PC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\arm64-v8a\build.ninja	î³³áÕ2<18>Ü ±þÛ®Ô2X
+PC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\arm64-v8a\build.ninja	»’’¦Ö2<18>Ü ±þÛ®Ô2X
 V
-TC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\arm64-v8a\build.ninja.txt	î³³áÕ2]
+TC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\arm64-v8a\build.ninja.txt	»’’¦Ö2]
 [
-YC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\arm64-v8a\build_file_index.txt	î³³áÕ2
S ª€Ü®Ô2^
+YC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\arm64-v8a\build_file_index.txt	»’’¦Ö2
S ª€Ü®Ô2^
 \
-ZC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\arm64-v8a\compile_commands.json	î³³áÕ2b
+ZC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\arm64-v8a\compile_commands.json	»’’¦Ö2b
 `
-^C:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\arm64-v8a\compile_commands.json.bin	î³³áÕ2	h
+^C:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\arm64-v8a\compile_commands.json.bin	»’’¦Ö2	h
 f
-dC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\arm64-v8a\metadata_generation_command.txt	î³³áÕ2
+dC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\arm64-v8a\metadata_generation_command.txt	»’’¦Ö2
 Ê ¡€Ü®Ô2[
 Y
-WC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\arm64-v8a\prefab_config.json	î³³áÕ2
( ¥€Ü®Ô2`
+WC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\arm64-v8a\prefab_config.json	¼’’¦Ö2
( ¥€Ü®Ô2`
 ^
-\C:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\arm64-v8a\symbol_folder_index.txt	î³³áÕ2
S ©€Ü®Ô2W
+\C:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\arm64-v8a\symbol_folder_index.txt	¼’’¦Ö2
S ©€Ü®Ô2W
 U
-SC:\flutter\src\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt	î³³áÕ2
§ ÑÜÐßÓ2
+SC:\flutter\src\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt	¼’’¦Ö2
§ ÑÜÐßÓ2
--- a/android/app/.cxx/Debug/6q3k463w/armeabi-v7a/configure_fingerprint.bin
+++ b/android/app/.cxx/Debug/6q3k463w/armeabi-v7a/configure_fingerprint.bin
@ -2,27 +2,27 @@ C/C++ Structured Logg
 e
 cC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\armeabi-v7a\additional_project_files.txtC
 A
-?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	‘´³áÕ2 ©“Ü®Ô2d
+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	•®’¦Ö2 ©“Ü®Ô2d
 b
-`C:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\armeabi-v7a\android_gradle_build.json	‘´³áÕ2Â ¬“Ü®Ô2i
+`C:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\armeabi-v7a\android_gradle_build.json	–®’¦Ö2Â ¬“Ü®Ô2i
 g
-eC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\armeabi-v7a\android_gradle_build_mini.json	‘´³áÕ2• ±“Ü®Ô2V
+eC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\armeabi-v7a\android_gradle_build_mini.json	–®’¦Ö2• ±“Ü®Ô2V
 T
-RC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\armeabi-v7a\build.ninja	‘´³áÕ2‹Ü Ÿ’Ü®Ô2Z
+RC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\armeabi-v7a\build.ninja	–®’¦Ö2‹Ü Ÿ’Ü®Ô2Z
 X
-VC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\armeabi-v7a\build.ninja.txt	‘´³áÕ2_
+VC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\armeabi-v7a\build.ninja.txt	–®’¦Ö2_
 ]
-[C:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\armeabi-v7a\build_file_index.txt	‘´³áÕ2
S µ“Ü®Ô2`
+[C:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\armeabi-v7a\build_file_index.txt	–®’¦Ö2
S µ“Ü®Ô2`
 ^
-\C:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\armeabi-v7a\compile_commands.json	‘´³áÕ2d
+\C:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\armeabi-v7a\compile_commands.json	–®’¦Ö2d
 b
-`C:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\armeabi-v7a\compile_commands.json.bin	’´³áÕ2	j
+`C:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\armeabi-v7a\compile_commands.json.bin	–®’¦Ö2	j
 h
-fC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\armeabi-v7a\metadata_generation_command.txt	’´³áÕ2
+fC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\armeabi-v7a\metadata_generation_command.txt	–®’¦Ö2
 Ô ³“Ü®Ô2]
 [
-YC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\armeabi-v7a\prefab_config.json	’´³áÕ2
( ´“Ü®Ô2b
+YC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\armeabi-v7a\prefab_config.json	–®’¦Ö2
( ´“Ü®Ô2b
 `
-^C:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\armeabi-v7a\symbol_folder_index.txt	’´³áÕ2
U µ“Ü®Ô2W
+^C:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\armeabi-v7a\symbol_folder_index.txt	–®’¦Ö2
U µ“Ü®Ô2W
 U
-SC:\flutter\src\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt	’´³áÕ2
§ ÑÜÐßÓ2
+SC:\flutter\src\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt	–®’¦Ö2
§ ÑÜÐßÓ2
--- a/android/app/.cxx/Debug/6q3k463w/x86/configure_fingerprint.bin
+++ b/android/app/.cxx/Debug/6q3k463w/x86/configure_fingerprint.bin
@ -2,27 +2,27 @@ C/C++ Structured Log_
 ]
 [C:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\x86\additional_project_files.txtC
 A
-?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	²´³áÕ2 ª¢Ü®Ô2\
+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	·¯’¦Ö2 ª¢Ü®Ô2\
 Z
-XC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\x86\android_gradle_build.json	²´³áÕ2² ¢Ü®Ô2a
+XC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\x86\android_gradle_build.json	·¯’¦Ö2² ¢Ü®Ô2a
 _
-]C:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\x86\android_gradle_build_mini.json	²´³áÕ2… ±¢Ü®Ô2N
+]C:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\x86\android_gradle_build_mini.json	·¯’¦Ö2… ±¢Ü®Ô2N
 L
-JC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\x86\build.ninja	²´³áÕ2ãÛ ¯¡Ü®Ô2R
+JC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\x86\build.ninja	·¯’¦Ö2ãÛ ¯¡Ü®Ô2R
 P
-NC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\x86\build.ninja.txt	²´³áÕ2W
+NC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\x86\build.ninja.txt	·¯’¦Ö2W
 U
-SC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\x86\build_file_index.txt	²´³áÕ2
S ¶¢Ü®Ô2X
+SC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\x86\build_file_index.txt	·¯’¦Ö2
S ¶¢Ü®Ô2X
 V
-TC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\x86\compile_commands.json	²´³áÕ2\
+TC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\x86\compile_commands.json	·¯’¦Ö2\
 Z
-XC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\x86\compile_commands.json.bin	²´³áÕ2	b
+XC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\x86\compile_commands.json.bin	·¯’¦Ö2	b
 `
-^C:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\x86\metadata_generation_command.txt	²´³áÕ2
+^C:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\x86\metadata_generation_command.txt	·¯’¦Ö2
 ¬ ³¢Ü®Ô2U
 S
-QC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\x86\prefab_config.json	²´³áÕ2
( ´¢Ü®Ô2Z
+QC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\x86\prefab_config.json	·¯’¦Ö2
( ´¢Ü®Ô2Z
 X
-VC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\x86\symbol_folder_index.txt	³´³áÕ2
M µ¢Ü®Ô2W
+VC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\x86\symbol_folder_index.txt	·¯’¦Ö2
M µ¢Ü®Ô2W
 U
-SC:\flutter\src\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt	³´³áÕ2
§ ÑÜÐßÓ2
+SC:\flutter\src\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt	·¯’¦Ö2
§ ÑÜÐßÓ2
--- a/android/app/.cxx/Debug/6q3k463w/x86_64/configure_fingerprint.bin
+++ b/android/app/.cxx/Debug/6q3k463w/x86_64/configure_fingerprint.bin
@ -2,27 +2,27 @@ C/C++ Structured Logb
 `
 ^C:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\x86_64\additional_project_files.txtC
 A
-?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	å´³áÕ2 ¯±Ü®Ô2_
+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	´°’¦Ö2 ¯±Ü®Ô2_
 ]
-[C:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\x86_64\android_gradle_build.json	å´³áÕ2¸ ²±Ü®Ô2d
+[C:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\x86_64\android_gradle_build.json	´°’¦Ö2¸ ²±Ü®Ô2d
 b
-`C:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\x86_64\android_gradle_build_mini.json	å´³áÕ2‹ ¸±Ü®Ô2Q
+`C:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\x86_64\android_gradle_build_mini.json	´°’¦Ö2‹ ¸±Ü®Ô2Q
 O
-MC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\x86_64\build.ninja	å´³áÕ2òÛ ³°Ü®Ô2U
+MC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\x86_64\build.ninja	´°’¦Ö2òÛ ³°Ü®Ô2U
 S
-QC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\x86_64\build.ninja.txt	å´³áÕ2Z
+QC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\x86_64\build.ninja.txt	´°’¦Ö2Z
 X
-VC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\x86_64\build_file_index.txt	å´³áÕ2
S ½±Ü®Ô2[
+VC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\x86_64\build_file_index.txt	´°’¦Ö2
S ½±Ü®Ô2[
 Y
-WC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\x86_64\compile_commands.json	å´³áÕ2_
+WC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\x86_64\compile_commands.json	´°’¦Ö2_
 ]
-[C:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\x86_64\compile_commands.json.bin	é´³áÕ2	e
+[C:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\x86_64\compile_commands.json.bin	´°’¦Ö2	e
 c
-aC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\x86_64\metadata_generation_command.txt	é´³áÕ2
+aC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\x86_64\metadata_generation_command.txt	´°’¦Ö2
 » º±Ü®Ô2X
 V
-TC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\x86_64\prefab_config.json	é´³áÕ2
( »±Ü®Ô2]
+TC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\x86_64\prefab_config.json	´°’¦Ö2
( »±Ü®Ô2]
 [
-YC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\x86_64\symbol_folder_index.txt	é´³áÕ2
P ¼±Ü®Ô2W
+YC:\flutter code\clone\FCSC\android\app\.cxx\Debug\6q3k463w\x86_64\symbol_folder_index.txt	´°’¦Ö2
P ¼±Ü®Ô2W
 U
-SC:\flutter\src\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt	é´³áÕ2
§ ÑÜÐßÓ2
+SC:\flutter\src\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt	´°’¦Ö2
§ ÑÜÐßÓ2
--- a/lib/config/api_config.dart
+++ b/lib/config/api_config.dart
@ -1,3 +1,5 @@
 // api_config.dart
 // const String apiUrl = 'http://192.168.1.26:8090';
-const String apiUrl = 'https://pbdev.venbait.in/';
+// const String apiUrl = 'https://pbdev.venbait.in/';
+const String apiUrl = 'https://pb.venbait.in/';
+
--- a/lib/config/my_router.dart
+++ b/lib/config/my_router.dart
@ -640,16 +640,17 @@ final GoRouter router = GoRouter(
      builder: (context, state) => Contact(),
    ),
  ],
-  redirect: (context, state) async {
-    if (state.uri.path == '/SessionCheckScreen' || state.uri.path == '/login') {
+    redirect: (context, state) async {
+      if (state.uri.path == '/SessionCheckScreen' || state.uri.path == '/login') {
+        return null;
+      }
+
+      final session = await PAuthRepo().fetchLocallyStored();
+
+      if (session == null || session.freshness == SessionFreshness.expired) {
+        print('Session expired, redirecting to login with intendedPath: ${state.uri.path}');
+        return '/login${state.uri.path != '/' ? '?intendedPath=${state.uri.path}' : ''}';
+      }
      return null;
    }
-
-    final session = await PAuthRepo().fetchLocallyStored();
-    if (session == null || session.freshness == SessionFreshness.expired) {
-      return '/login';
-    }
-
-    return null;
-  },
 );
--- a/lib/config/sessionCheckScreen.dart
+++ b/lib/config/sessionCheckScreen.dart
@ -27,10 +27,11 @@ class _SessionCheckScreenState extends State<SessionCheckScreen> {
    final SessionEntity? session = await _authRepo.fetchLocallyStored();
    final GoRouterState state = GoRouterState.of(context);
    final String? intendedPath = state.uri.toString().isNotEmpty && state.uri.path != '/'
-        ? state.uri.path // Use just the path (e.g., "/chartS1")
+        ? state.uri.path
        : null;

    print('fetchLocallyStored $session');
+    print('navigating to intended path: $intendedPath');

    // First if: Check if app data exists (indicating app setup)
    if (session != null) {
--- a/lib/presentation/routes/auth_routes/login_route.dart
+++ b/lib/presentation/routes/auth_routes/login_route.dart
@ -370,20 +370,20 @@ class LoginRoute extends HookConsumerWidget {
          }
          try {
            final bool isProfileComplete = await profileStatus(userId);
-            print(isProfileComplete);
+            print("Is Profile Complete: $isProfileComplete");
+
+            // Extract intendedPath from query parameters (if coming from redirect)
+            final String? intendedPath = GoRouterState.of(context).uri.queryParameters['intendedPath'];
+            print("Extracted intendedPath after login: $intendedPath");
+
+            if (!context.mounted) return;
+
            if (isProfileComplete) {
-              print('home');
-              // if (role == 'admin') {
-              //   context.go('/myhomepage');
-              // } else {
-              //   context.go('/myhomepage');
-              // }
-              final extra = GoRouterState.of(context).extra as Map<String, dynamic>?;
-              final String? intendedPath = extra?['intendedPath'] as String?;
+              print('Redirecting to Home / Intended Path');
              context.go(intendedPath ?? '/myhomepage');
            } else {
-              print('profile');
-              if (userId != null && userId.isNotEmpty) {
+              print('Redirecting to Profile Setup');
+              if (userId.isNotEmpty) {
                context.go('/profile/$userId');
              } else {
                print('Error: userId is null or empty.');