bug fix

2025-03-03 19:03:50 +05:30 · 2025-03-03 19:03:50 +05:30 · f317685f5d
commit f317685f5d
parent 74196e1d1a
9 changed files with 1406 additions and 1023 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/my_router.dart
+++ b/lib/config/my_router.dart
@ -298,6 +298,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:go_router/go_router.dart';
 import 'package:uae_stat/config/sessionCheckScreen.dart';
+import 'package:uae_stat/domain/entities/session_entity.dart';
+import 'package:uae_stat/infrastructure/data/p_auth_repo.dart';
 import 'package:uae_stat/presentation/Screens/Bottom%20Navigation%20Pages/UAE_Numbers/Social/marriages.dart';
 import 'package:uae_stat/presentation/Screens/auth_verification/privacy_policy.dart';
 import 'package:uae_stat/presentation/Screens/auth_verification/registration.dart';
@ -365,7 +367,7 @@ final GoRouter router = GoRouter(
  routes: [
    GoRoute(
      path: '/',
-      //builder: (context, state) => LoginRoute(),
+      //builder: (context, state) => MyHomePage(),
      builder: (context, state) => SessionCheckScreen(),

    ),
@ -638,4 +640,16 @@ final GoRouter router = GoRouter(
      builder: (context, state) => Contact(),
    ),
  ],
+  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) {
+      return '/login';
+    }
+
+    return null;
+  },
 );
--- a/lib/config/sessionCheckScreen.dart
+++ b/lib/config/sessionCheckScreen.dart
@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:uae_stat/infrastructure/data/p_auth_repo.dart';
+import 'package:uae_stat/domain/entities/session_entity.dart';
+import 'package:url_launcher/url_launcher.dart';

 class SessionCheckScreen extends StatefulWidget {
  @override
@ -10,51 +12,69 @@ class SessionCheckScreen extends StatefulWidget {
 class _SessionCheckScreenState extends State<SessionCheckScreen> {
  final PAuthRepo _authRepo = PAuthRepo();

+  String get playStoreUrl => "https://play.google.com/store/apps/details?id=ae.gov.fcsc.frontend";
+
  @override
  void initState() {
    super.initState();
-    _checkSession();
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      _checkSession();
+    });
  }

-  /// 🔍 **Check if Shared Intent Path Exists & Validate Login**
  Future<void> _checkSession() async {
-    await Future.delayed(const Duration(seconds: 2)); // Optional splash delay
-
-    final session = await _authRepo.fetchLocallyStored();
+    await Future.delayed(Duration(seconds: 2)); // Optional splash delay
+    final SessionEntity? session = await _authRepo.fetchLocallyStored();
    final GoRouterState state = GoRouterState.of(context);
    final String? intendedPath = state.uri.toString().isNotEmpty && state.uri.path != '/'
-        ? state.uri.toString()
+        ? state.uri.path // Use just the path (e.g., "/chartS1")
        : null;

-    print('🔍 Checking session... Found: $session');
-    print('📌 Shared intent path: $intendedPath');
+    print('fetchLocallyStored $session');

-    // **If the user is NOT logged in**
-    if (session == null) {
-      print('🚫 No session found. Redirecting to login.');
-      if (mounted) {
-        context.go('/login', extra: {'intendedPath': intendedPath ?? '/myhomepage'});
+    // First if: Check if app data exists (indicating app setup)
+    if (session != null) {
+      // Second if: Check if user is logged in (session is valid)
+      if (session.freshness != SessionFreshness.expired) {
+        // User is logged in, check for shared intent path
+        if (intendedPath != null) {
+          print('navigating to intended path: $intendedPath');
+          if (mounted) {
+            context.go(intendedPath);
+          }
+        } else {
+          print('myhomepage');
+          if (mounted) {
+            context.go('/myhomepage'); // Redirect to home
+          }
+        }
+      } else {
+        // User is not logged in, redirect to login with intended path if present
+        print('session expired, redirecting to login');
+        if (mounted) {
+          context.go('/login', extra: intendedPath != null ? {'intendedPath': intendedPath} : null);
+        }
      }
-      return;
-    }
-
-    // **If user is logged in & there is a shared path, navigate there**
-    if (intendedPath != null && intendedPath != state.uri.toString()) {
-      print('🔗 Navigating to shared path after login: $intendedPath');
-      if (mounted) context.go(intendedPath);
    } else {
-      print('🏠 No shared path or already on shared path. Redirecting to homepage.');
-      if (mounted) context.go('/myhomepage');
+      // No session data, redirect to Play Store
+      print('no session data, redirecting to play store');
+      if (mounted) {
+        _redirectToPlayStore();
+      }
+    }
+  }
+
+  Future<void> _redirectToPlayStore() async {
+    final Uri url = Uri.parse(playStoreUrl);
+
+    if (await canLaunchUrl(url)) {
+      await launchUrl(url, mode: LaunchMode.externalApplication);
    }
  }

  @override
  Widget build(BuildContext context) {
-    return Scaffold(
-      body: Center(
-        child: CircularProgressIndicator(),
-      ),
-    );
+    return SizedBox.shrink();
  }
 }

--- a/lib/presentation/Screens/charts/screens/chart_screen.dart
+++ b/lib/presentation/Screens/charts/screens/chart_screen.dart
--- a/lib/presentation/routes/auth_routes/login_route.dart
+++ b/lib/presentation/routes/auth_routes/login_route.dart
@ -378,7 +378,9 @@ class LoginRoute extends HookConsumerWidget {
              // } else {
              //   context.go('/myhomepage');
              // }
-              context.go('/myhomepage');
+              final extra = GoRouterState.of(context).extra as Map<String, dynamic>?;
+              final String? intendedPath = extra?['intendedPath'] as String?;
+              context.go(intendedPath ?? '/myhomepage');
            } else {
              print('profile');
              if (userId != null && userId.isNotEmpty) {
--- a/277
+++ b/277
@ -0,0 +1,277 @@
+[33mcommit 74196e1d1a5744180cc20296f7d61f6cde7be8a2[m[33m ([m[1;36mHEAD[m[33m -> [m[1;32mdev[m[33m)[m
+Author: Juki-shiba <juki@sightspectrum.com>
+Date:   Mon Mar 3 14:45:06 2025 +0530
+
+    Saving local changes before pulling
+
+[33mcommit d4ad4852a8c263bd686bec8af5184169267b031f[m
+Merge: ec5a402 bbae4b5
+Author: Juki-shiba <juki@sightspectrum.com>
+Date:   Mon Mar 3 14:45:00 2025 +0530
+
+    Saving local changes before pulling
+
+[33mcommit ec5a40285dd72f302a8f9598bc139650abe5674c[m
+Author: Juki-shiba <juki@sightspectrum.com>
+Date:   Mon Mar 3 14:26:28 2025 +0530
+
+    Saving local changes before pulling
+
+[33mcommit bbae4b5789a9992d01223f49fd6628db59a59ae6[m[33m ([m[1;31morigin/dev[m[33m)[m
+Author: Kalonkarthik <karthikk@sightspectrum.in>
+Date:   Fri Feb 28 18:04:45 2025 +0530
+
+    Contact page created
+
+[33mcommit de820662f75e57ca43a406354d5bc980e0e5dff8[m
+Author: Kalonkarthik <karthikk@sightspectrum.in>
+Date:   Fri Feb 28 12:31:34 2025 +0530
+
+    bookmark message color change
+
+[33mcommit cd1bb0fc8cf7faa7d44977003948f14dd06b734c[m
+Merge: d7a1b5a ca24970
+Author: venbaittech <bitbucket@venbainfotech.com>
+Date:   Fri Feb 28 09:24:03 2025 +0530
+
+    merge
+
+[33mcommit d7a1b5aa385966d8d6f7f57e00cdf73d079fc6c7[m
+Author: venbaittech <bitbucket@venbainfotech.com>
+Date:   Fri Feb 28 09:01:52 2025 +0530
+
+    chart api changes and dev pocketbase url
+
+[33mcommit ca24970c53fd01acc52139cfe059dfcff4445254[m
+Author: Kalonkarthik <karthikk@sightspectrum.in>
+Date:   Thu Feb 27 17:33:22 2025 +0530
+
+    svg icons replaced,validate msg aligned,bookmark haeding added etc
+
+[33mcommit 30db38c60bb34b3c9817e6e016d6d4b3dd8a17cb[m
+Author: Kalonkarthik <karthikk@sightspectrum.in>
+Date:   Wed Feb 26 15:25:51 2025 +0530
+
+    all bookmark categorized and arabic validation bug
+
+[33mcommit cfe5b5bf20b8bb8880f7c8acb24fda7d64a3e6fd[m
+Author: venbaittech <bitbucket@venbainfotech.com>
+Date:   Tue Feb 25 18:08:20 2025 +0530
+
+    bookmark and cards changes done
+
+[33mcommit cd141bfcb4706c194480732561503c6559970146[m
+Author: venbaittech <bitbucket@venbainfotech.com>
+Date:   Mon Feb 24 18:41:21 2025 +0530
+
+    UAE number page search functionality added
+
+[33mcommit 9368e08f910976c58f4262fccb1b5ee681b81459[m
+Merge: f054dd8 0dc95dd
+Author: venbaittech <bitbucket@venbainfotech.com>
+Date:   Mon Feb 24 09:07:30 2025 +0530
+
+    chart screen merged
+
+[33mcommit f054dd83d50f4d53c42c727b4e92efeebd171b5a[m
+Author: venbaittech <bitbucket@venbainfotech.com>
+Date:   Mon Feb 24 09:02:05 2025 +0530
+
+    chart changes
+
+[33mcommit 0dc95dd63306194fdb1dcd4f82c66b69aea52525[m
+Author: Kalonkarthik <karthikk@sightspectrum.in>
+Date:   Fri Feb 21 17:57:08 2025 +0530
+
+    bookmark categrized
+
+[33mcommit dc3bfbbaaaf1bbff178476f15019162977d11480[m
+Author: Juki-shiba <juki@sightspectrum.com>
+Date:   Fri Feb 21 15:23:35 2025 +0530
+
+    bug fix & share cont
+
+[33mcommit a1993712aca4060c5f1c44a4db035bba4d48c198[m
+Author: venbaittech <bitbucket@venbainfotech.com>
+Date:   Fri Feb 21 09:11:34 2025 +0530
+
+    chart changes
+
+[33mcommit bdcdf737a88084a6a14df9d0b38dd193e4b9c4f8[m
+Merge: fc8a247 585d585
+Author: venbaittech <bitbucket@venbainfotech.com>
+Date:   Fri Feb 21 08:57:06 2025 +0530
+
+    Merge branch 'dev' of github.com:VinistanSS/FCSC into dev
+
+[33mcommit fc8a2479c23e1bf7762ae3b699ca0978e820691b[m
+Author: venbaittech <bitbucket@venbainfotech.com>
+Date:   Fri Feb 21 08:56:58 2025 +0530
+
+    version code
+
+[33mcommit 585d585608daab3c2550dbc502b1260d397d4f5f[m
+Merge: 95a8032 349c815
+Author: Juki-shiba <juki@sightspectrum.com>
+Date:   Thu Feb 20 18:23:43 2025 +0530
+
+    Updated UI for logout confirmation popup
+
+[33mcommit 95a803269b8993ebfda61c0f245afa9fb01a88ef[m
+Merge: c879853 a969c4b
+Author: Juki-shiba <juki@sightspectrum.com>
+Date:   Thu Feb 20 18:18:40 2025 +0530
+
+    Updated UI for logout confirmation popup
+
+[33mcommit 349c815f63a4aed87fcd0039b9002d426db045ae[m
+Merge: 704c2d4 a969c4b
+Author: Kalonkarthik <karthikk@sightspectrum.in>
+Date:   Thu Feb 20 18:09:42 2025 +0530
+
+    merge commit
+
+[33mcommit c87985381618a66d3242a8921a070b82da576d93[m
+Author: Juki-shiba <juki@sightspectrum.com>
+Date:   Thu Feb 20 18:03:51 2025 +0530
+
+    drawer change
+
+[33mcommit 704c2d409f830d071c65e4db6f261a7a8104b8f8[m
+Author: Kalonkarthik <karthikk@sightspectrum.in>
+Date:   Thu Feb 20 17:53:18 2025 +0530
+
+    Validation message arabic Translated
+
+[33mcommit a969c4b37e6997a0a6e4e3172a8955077715a432[m
+Merge: 25eb1a0 84c62a4
+Author: venbaittech <bitbucket@venbainfotech.com>
+Date:   Thu Feb 20 17:51:59 2025 +0530
+
+    Merge branch 'dev' of github.com:VinistanSS/FCSC into dev
+
+[33mcommit 25eb1a06e9fd12e09b37cda2fbcf45432f7b215e[m
+Author: venbaittech <bitbucket@venbainfotech.com>
+Date:   Thu Feb 20 17:51:51 2025 +0530
+
+    chart changes done
+
+[33mcommit 7935d944a2ca4217a4bc62c3c94d0a03e9350b5e[m
+Author: Juki-shiba <juki@sightspectrum.com>
+Date:   Wed Feb 19 18:28:24 2025 +0530
+
+    fig fix
+
+[33mcommit 84c62a4cc7184389d437bb6904381fe01e25935d[m
+Author: Kalonkarthik <karthikk@sightspectrum.in>
+Date:   Wed Feb 19 18:20:39 2025 +0530
+
+    User Guide Arabic Translation
+
+[33mcommit 3cc3a9bcbdf8d56d398618ba18c72b25cb8bccbc[m
+Merge: 80fc023 681f3b4
+Author: venbaittech <bitbucket@venbainfotech.com>
+Date:   Tue Feb 18 18:26:38 2025 +0530
+
+    Merge branch 'dev' of github.com:VinistanSS/FCSC into dev
+
+[33mcommit 80fc023b4aef008cb10cd3f2058e0f5647098bf3[m
+Author: venbaittech <bitbucket@venbainfotech.com>
+Date:   Tue Feb 18 18:26:12 2025 +0530
+
+    charts bug fix
+
+[33mcommit 681f3b49efb1509d1f9e7cc10c58633c746ae887[m
+Author: Kalonkarthik <karthikk@sightspectrum.in>
+Date:   Tue Feb 18 18:01:54 2025 +0530
+
+    App Tour Arabic Updated
+
+[33mcommit feca758194785c0ec7298bd7a18cf9237e28b7ec[m
+Merge: d1bcedd 14d52bd
+Author: venbaittech <bitbucket@venbainfotech.com>
+Date:   Tue Feb 18 09:40:07 2025 +0530
+
+    charts and ui changes
+
+[33mcommit d1bcedd4fe7b1136765b1730015b72f1eb259b42[m
+Author: venbaittech <bitbucket@venbainfotech.com>
+Date:   Tue Feb 18 09:33:59 2025 +0530
+
+    charts
+
+[33mcommit 14d52bde7590b29707ba49963e0bca5cecddfd90[m
+Author: Juki-shiba <juki@sightspectrum.com>
+Date:   Mon Feb 17 18:33:43 2025 +0530
+
+    Bug Fix - Manage User
+
+[33mcommit e25ddaafd1ff712c8cebb46da9f60bcb720188e0[m
+Merge: 328c236 4917749
+Author: Juki-shiba <juki@sightspectrum.com>
+Date:   Mon Feb 17 18:32:56 2025 +0530
+
+    Bug Fix - Manage User
+
+[33mcommit 328c236b055a10681fa842e60328b8449bb4d7d0[m
+Author: Juki-shiba <juki@sightspectrum.com>
+Date:   Mon Feb 17 18:12:57 2025 +0530
+
+    Bug Fix - Manage User
+
+[33mcommit 0bef09eac04b5e79401113d586bda3f2f9adb9be[m
+Author: Juki-shiba <juki@sightspectrum.com>
+Date:   Mon Feb 17 16:24:54 2025 +0530
+
+    bug fix
+
+[33mcommit 4917749f653e68a4f632fa82c060e21b7571171f[m
+Author: venbaittech <bitbucket@venbainfotech.com>
+Date:   Sat Feb 15 18:31:52 2025 +0530
+
+    notification and chart changes done
+
+[33mcommit f4186a876b5b8993483d5a2fe7526cd3d8e88386[m
+Merge: 140ea24 8e5c0af
+Author: venbaittech <bitbucket@venbainfotech.com>
+Date:   Fri Feb 14 18:25:27 2025 +0530
+
+    Merge branch 'dev' of github.com:VinistanSS/FCSC into dev
+
+[33mcommit 140ea2405a52d484d8416452357ddc3ae53a5c7b[m
+Author: venbaittech <bitbucket@venbainfotech.com>
+Date:   Fri Feb 14 18:25:18 2025 +0530
+
+    chart and card changes
+
+[33mcommit 8e5c0af26cf373fbf1a5b69381a655d0b91986c5[m
+Author: Kalonkarthik <karthikk@sightspectrum.in>
+Date:   Fri Feb 14 17:37:26 2025 +0530
+
+    create new password fix
+
+[33mcommit 3779e171080b69f1c6d6e227dfabca4e9727d329[m
+Merge: a90782a 21c4525
+Author: Juki-shiba <juki@sightspectrum.com>
+Date:   Fri Feb 14 17:17:12 2025 +0530
+
+    drawer update
+
+[33mcommit a90782a48bb2c0985c29c95b8c0060335e71aae5[m
+Author: Juki-shiba <juki@sightspectrum.com>
+Date:   Fri Feb 14 17:06:35 2025 +0530
+
+    drawer update
+
+[33mcommit 21c4525db311552356ac3c999f15efbdbb2bb21a[m
+Author: Kalonkarthik <karthikk@sightspectrum.in>
+Date:   Fri Feb 14 16:14:22 2025 +0530
+
+    Back button UserGuide,and open project bux fix
+
+[33mcommit dafc089ae9fba86cb7a22d10d3edc3b29246f0f3[m
+Author: venbaittech <bitbucket@venbainfotech.com>
+Date:   Fri Feb 14 09:30:01 2025 +0530
+
+    chart bug fix
+