admin/marco.pms.mobileapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert 7fb5a5217aee404e3c940f0729086460d9bd1c4c

Browse Source 
revert fixed initial loging
This commit is contained in:
vaibhav.surve 2025-10-11 08:49:37 +00:00
parent 26611d3650
commit 83218166ba
4 changed files with 114 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/helpers/services/app_initializer.dart
View File

@ -1,7 +1,6 @@
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:url_strategy/url_strategy.dart'; import 'package:url_strategy/url_strategy.dart';
import 'package:firebase_core/firebase_core.dart'; import 'package:firebase_core/firebase_core.dart';
import 'package:marco/helpers/services/storage/local_storage.dart'; import 'package:marco/helpers/services/storage/local_storage.dart';
import 'package:marco/helpers/services/app_logger.dart'; import 'package:marco/helpers/services/app_logger.dart';
import 'package:marco/helpers/services/auth_service.dart'; import 'package:marco/helpers/services/auth_service.dart';
@ -39,10 +38,23 @@ Future<void> initializeApp() async {
} }
} }
Future<void> _handleAuthTokens() async {
final refreshToken = await LocalStorage.getRefreshToken();
if (refreshToken?.isNotEmpty ?? false) {
logSafe("🔁 Refresh token found. Attempting to refresh JWT...");
final success = await AuthService.refreshToken();
if (!success) {
logSafe("⚠️ Refresh token invalid or expired. User must login again.");
}
} else {
logSafe("❌ No refresh token found. Skipping refresh.");
}
}
Future<void> _setupUI() async { Future<void> _setupUI() async {
setPathUrlStrategy(); setPathUrlStrategy();
await SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge); await SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
logSafe("💡 UI setup completed."); logSafe("💡 UI setup completed with default system behavior.");
} }
Future<void> _setupFirebase() async { Future<void> _setupFirebase() async {
@ -65,19 +77,6 @@ Future<void> _setupDeviceInfo() async {
logSafe("📱 Device Info: ${deviceInfoService.deviceData}"); logSafe("📱 Device Info: ${deviceInfoService.deviceData}");
} }
Future<void> _handleAuthTokens() async {
final refreshToken = LocalStorage.getRefreshToken();
if (refreshToken?.isNotEmpty ?? false) {
logSafe("🔁 Refresh token found. Attempting refresh...");
final success = await AuthService.refreshToken();
if (!success) {
logSafe("⚠️ Refresh failed — user must login again.");
}
} else {
logSafe("❌ No refresh token — skipping refresh.");
}
}
Future<void> _setupTheme() async { Future<void> _setupTheme() async {
await ThemeCustomizer.init(); await ThemeCustomizer.init();
logSafe("💡 Theme customizer initialized."); logSafe("💡 Theme customizer initialized.");
@ -85,10 +84,10 @@ Future<void> _setupTheme() async {
Future<void> _setupFirebaseMessaging() async { Future<void> _setupFirebaseMessaging() async {
await FirebaseNotificationService().initialize(); await FirebaseNotificationService().initialize();
logSafe("💬 Firebase Messaging initialized."); logSafe("💡 Firebase Messaging initialized.");
} }
void _finalizeAppStyle() { void _finalizeAppStyle() {
AppStyle.init(); AppStyle.init();
logSafe("🎨 AppStyle initialized."); logSafe("💡 AppStyle initialized.");
} }

11
lib/main.dart
View File

@ -12,15 +12,20 @@ import 'package:marco/helpers/services/storage/local_storage.dart';
Future<void> main() async { Future<void> main() async {
WidgetsFlutterBinding.ensureInitialized(); WidgetsFlutterBinding.ensureInitialized();
// --- Logging setup --- // Initialize logging system
await initLogging(); await initLogging();
logSafe("🚀 App starting..."); logSafe("App starting...");
// ✅ Ensure local storage is ready before enabling remote logging
await LocalStorage.init(); await LocalStorage.init();
logSafe("💡 Local storage initialized (early init for logging).");
// Now safe to enable remote logging
enableRemoteLogging(); enableRemoteLogging();
try { try {
await initializeApp(); await initializeApp();
logSafe("✅ App fully initialized"); logSafe("App initialized successfully.");
runApp( runApp(
ChangeNotifierProvider( ChangeNotifierProvider(

156
lib/routes.dart
View File

@ -2,29 +2,26 @@ import 'package:flutter/material.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:marco/helpers/services/auth_service.dart'; import 'package:marco/helpers/services/auth_service.dart';
import 'package:marco/helpers/services/tenant_service.dart'; import 'package:marco/helpers/services/tenant_service.dart';
// Auth
import 'package:marco/view/auth/login_screen.dart';
import 'package:marco/view/auth/login_option_screen.dart';
import 'package:marco/view/auth/register_account_screen.dart';
import 'package:marco/view/auth/forgot_password_screen.dart'; import 'package:marco/view/auth/forgot_password_screen.dart';
import 'package:marco/view/auth/login_screen.dart';
import 'package:marco/view/auth/register_account_screen.dart';
import 'package:marco/view/auth/reset_password_screen.dart'; import 'package:marco/view/auth/reset_password_screen.dart';
import 'package:marco/view/auth/mpin_screen.dart'; import 'package:marco/view/error_pages/coming_soon_screen.dart';
import 'package:marco/view/auth/mpin_auth_screen.dart'; import 'package:marco/view/error_pages/error_404_screen.dart';
// Dashboard + Modules import 'package:marco/view/error_pages/error_500_screen.dart';
import 'package:marco/view/dashboard/dashboard_screen.dart'; import 'package:marco/view/dashboard/dashboard_screen.dart';
import 'package:marco/view/tenant/tenant_selection_screen.dart';
import 'package:marco/view/Attendence/attendance_screen.dart'; import 'package:marco/view/Attendence/attendance_screen.dart';
import 'package:marco/view/taskPlanning/daily_task_planning.dart'; import 'package:marco/view/taskPlanning/daily_task_planning.dart';
import 'package:marco/view/taskPlanning/daily_progress_report.dart'; import 'package:marco/view/taskPlanning/daily_progress_report.dart';
import 'package:marco/view/employees/employees_screen.dart'; import 'package:marco/view/employees/employees_screen.dart';
import 'package:marco/view/auth/login_option_screen.dart';
import 'package:marco/view/auth/mpin_screen.dart';
import 'package:marco/view/auth/mpin_auth_screen.dart';
import 'package:marco/view/directory/directory_main_screen.dart'; import 'package:marco/view/directory/directory_main_screen.dart';
import 'package:marco/view/expense/expense_screen.dart'; import 'package:marco/view/expense/expense_screen.dart';
import 'package:marco/view/document/user_document_screen.dart'; import 'package:marco/view/document/user_document_screen.dart';
// Error import 'package:marco/view/tenant/tenant_selection_screen.dart';
import 'package:marco/view/error_pages/coming_soon_screen.dart';
import 'package:marco/view/error_pages/error_404_screen.dart';
import 'package:marco/view/error_pages/error_500_screen.dart';
/// Middleware to enforce authentication and tenant selection
class AuthMiddleware extends GetMiddleware { class AuthMiddleware extends GetMiddleware {
@override @override
RouteSettings? redirect(String? route) { RouteSettings? redirect(String? route) {
@ -41,99 +38,88 @@ class AuthMiddleware extends GetMiddleware {
} }
} }
/// Returns the list of all app routes getPageRoute() {
List<GetPage> getPageRoute() { var routes = [
final List<GetPage> routes = [
// ========== AUTH ROUTES ==========
GetPage(name: '/auth/login', page: () => LoginScreen()),
GetPage(name: '/auth/login-option', page: () => LoginOptionScreen()),
GetPage(name: '/auth/register_account', page: () => const RegisterAccountScreen()),
GetPage(name: '/auth/forgot_password', page: () => ForgotPasswordScreen()),
GetPage(name: '/auth/reset_password', page: () => const ResetPasswordScreen()),
GetPage(name: '/auth/mpin', page: () => MPINScreen()),
GetPage(name: '/auth/mpin-auth', page: () => MPINAuthScreen()),
// ========== MAIN DASHBOARD ROUTES ==========
GetPage( GetPage(
name: '/', name: '/',
page: () => DashboardScreen(), page: () => DashboardScreen(),
middlewares: [AuthMiddleware()], middlewares: [AuthMiddleware()]),
),
GetPage( GetPage(
name: '/dashboard', name: '/dashboard',
page: () => DashboardScreen(), page: () => DashboardScreen(), // or your actual home screen
middlewares: [AuthMiddleware()], middlewares: [AuthMiddleware()],
), ),
GetPage( GetPage(
name: '/select-tenant', name: '/select-tenant',
page: () => const TenantSelectionScreen(), page: () => const TenantSelectionScreen(),
middlewares: [AuthMiddleware()], middlewares: [AuthMiddleware()]),
),
// ========== DASHBOARD SUBMODULES ========== // Dashboard
GetPage( GetPage(
name: '/dashboard/attendance', name: '/dashboard/attendance',
page: () => AttendanceScreen(), page: () => AttendanceScreen(),
middlewares: [AuthMiddleware()], middlewares: [AuthMiddleware()]),
),
GetPage( GetPage(
name: '/dashboard/employees', name: '/dashboard',
page: () => EmployeesScreen(), page: () => DashboardScreen(),
middlewares: [AuthMiddleware()], middlewares: [AuthMiddleware()]),
),
GetPage( GetPage(
name: '/dashboard/daily-task-Planning', name: '/dashboard/employees',
page: () => DailyTaskPlanningScreen(), page: () => EmployeesScreen(),
middlewares: [AuthMiddleware()], middlewares: [AuthMiddleware()]),
), // Daily Task Planning
GetPage( GetPage(
name: '/dashboard/daily-task-progress', name: '/dashboard/daily-task-Planning',
page: () => DailyProgressReportScreen(), page: () => DailyTaskPlanningScreen(),
middlewares: [AuthMiddleware()], middlewares: [AuthMiddleware()]),
),
GetPage( GetPage(
name: '/dashboard/directory-main-page', name: '/dashboard/daily-task-progress',
page: () => DirectoryMainScreen(), page: () => DailyProgressReportScreen(),
middlewares: [AuthMiddleware()], middlewares: [AuthMiddleware()]),
),
GetPage( GetPage(
name: '/dashboard/expense-main-page', name: '/dashboard/directory-main-page',
page: () => ExpenseMainScreen(), page: () => DirectoryMainScreen(),
middlewares: [AuthMiddleware()], middlewares: [AuthMiddleware()]),
), // Expense
GetPage( GetPage(
name: '/dashboard/document-main-page', name: '/dashboard/expense-main-page',
page: () => UserDocumentsPage(), page: () => ExpenseMainScreen(),
middlewares: [AuthMiddleware()], middlewares: [AuthMiddleware()]),
), // Documents
// ========== ERROR SCREENS ==========
GetPage( GetPage(
name: '/error/coming_soon', name: '/dashboard/document-main-page',
page: () => ComingSoonScreen(), page: () => UserDocumentsPage(),
middlewares: [AuthMiddleware()], middlewares: [AuthMiddleware()]),
), // Authentication
GetPage(name: '/auth/login', page: () => LoginScreen()),
GetPage(name: '/auth/login-option', page: () => LoginOptionScreen()),
GetPage(name: '/auth/mpin', page: () => MPINScreen()),
GetPage(name: '/auth/mpin-auth', page: () => MPINAuthScreen()),
GetPage( GetPage(
name: '/error/500', name: '/auth/register_account',
page: () => Error500Screen(), page: () => const RegisterAccountScreen()),
middlewares: [AuthMiddleware()], GetPage(name: '/auth/forgot_password', page: () => ForgotPasswordScreen()),
),
GetPage( GetPage(
name: '/error/404', name: '/auth/reset_password', page: () => const ResetPasswordScreen()),
page: () => Error404Screen(), // Error
middlewares: [AuthMiddleware()], GetPage(
), name: '/error/coming_soon',
page: () => ComingSoonScreen(),
middlewares: [AuthMiddleware()]),
GetPage(
name: '/error/500',
page: () => Error500Screen(),
middlewares: [AuthMiddleware()]),
GetPage(
name: '/error/404',
page: () => Error404Screen(),
middlewares: [AuthMiddleware()]),
]; ];
// ✅ Force uniform transition for all pages
return routes return routes
.map( .map((e) => GetPage(
(e) => GetPage(
name: e.name, name: e.name,
page: e.page, page: e.page,
middlewares: e.middlewares, middlewares: e.middlewares,
transition: Transition.noTransition, transition: Transition.noTransition))
),
)
.toList(); .toList();
} }

41
lib/view/my_app.dart
View File

@ -4,6 +4,7 @@ import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:marco/helpers/services/app_logger.dart'; import 'package:marco/helpers/services/app_logger.dart';
import 'package:marco/helpers/extensions/app_localization_delegate.dart';
import 'package:marco/helpers/services/localizations/language.dart'; import 'package:marco/helpers/services/localizations/language.dart';
import 'package:marco/helpers/services/navigation_services.dart'; import 'package:marco/helpers/services/navigation_services.dart';
import 'package:marco/helpers/services/storage/local_storage.dart'; import 'package:marco/helpers/services/storage/local_storage.dart';
@ -15,26 +16,25 @@ import 'package:marco/routes.dart';
class MyApp extends StatelessWidget { class MyApp extends StatelessWidget {
const MyApp({super.key}); const MyApp({super.key});
Future<String> _resolveInitialRoute() async { Future<String> _getInitialRoute() async {
try { try {
final token = LocalStorage.getJwtToken(); final token = LocalStorage.getJwtToken();
if (token == null || token.isEmpty) { if (token == null || token.isEmpty) {
logSafe("👤 No token — going to login option"); logSafe("User not logged in. Routing to /auth/login-option");
return "/auth/login-option"; return "/auth/login-option";
} }
final bool hasMpin = LocalStorage.getIsMpin(); final bool hasMpin = LocalStorage.getIsMpin();
if (hasMpin) { if (hasMpin) {
await LocalStorage.setBool("mpin_verified", false); await LocalStorage.setBool("mpin_verified", false);
logSafe("🔐 MPIN found — going to MPIN auth"); logSafe("Routing to /auth/mpin-auth");
return "/auth/mpin-auth"; return "/auth/mpin-auth";
} }
logSafe("🏠 Routing to dashboard"); logSafe("No MPIN. Routing to /dashboard");
return "/dashboard"; return "/dashboard";
} catch (e, stacktrace) { } catch (e, stacktrace) {
logSafe("❌ Error resolving initial route", logSafe("Error determining initial route",
level: LogLevel.error, error: e, stackTrace: stacktrace); level: LogLevel.error, error: e, stackTrace: stacktrace);
return "/auth/login-option"; return "/auth/login-option";
} }
@ -45,27 +45,21 @@ class MyApp extends StatelessWidget {
return Consumer<AppNotifier>( return Consumer<AppNotifier>(
builder: (_, notifier, __) { builder: (_, notifier, __) {
return FutureBuilder<String>( return FutureBuilder<String>(
future: _resolveInitialRoute(), future: _getInitialRoute(),
builder: (context, snapshot) { builder: (context, snapshot) {
if (snapshot.connectionState == ConnectionState.waiting) {
return const MaterialApp(
home: Scaffold(
body: Center(child: CircularProgressIndicator()),
),
);
}
if (snapshot.hasError) { if (snapshot.hasError) {
logSafe("❌ Error while determining initial route: ${snapshot.error}"); logSafe("FutureBuilder snapshot error",
level: LogLevel.error, error: snapshot.error);
return const MaterialApp( return const MaterialApp(
home: Scaffold( home: Center(child: Text("Error determining route")),
body: Center(child: Text("Error determining route")),
),
); );
} }
final initialRoute = snapshot.data ?? "/auth/login-option"; if (!snapshot.hasData) {
logSafe("🚦 Launching app with initial route: $initialRoute"); return const MaterialApp(
home: Center(child: CircularProgressIndicator()),
);
}
return GetMaterialApp( return GetMaterialApp(
debugShowCheckedModeBanner: false, debugShowCheckedModeBanner: false,
@ -73,7 +67,7 @@ class MyApp extends StatelessWidget {
darkTheme: AppTheme.darkTheme, darkTheme: AppTheme.darkTheme,
themeMode: ThemeCustomizer.instance.theme, themeMode: ThemeCustomizer.instance.theme,
navigatorKey: NavigationService.navigatorKey, navigatorKey: NavigationService.navigatorKey,
initialRoute: initialRoute, initialRoute: snapshot.data!,
getPages: getPageRoute(), getPages: getPageRoute(),
builder: (context, child) { builder: (context, child) {
NavigationService.registerContext(context); NavigationService.registerContext(context);
@ -82,7 +76,8 @@ class MyApp extends StatelessWidget {
child: child ?? const SizedBox(), child: child ?? const SizedBox(),
); );
}, },
localizationsDelegates: const [ localizationsDelegates: [
AppLocalizationsDelegate(context),
GlobalMaterialLocalizations.delegate, GlobalMaterialLocalizations.delegate,
GlobalWidgetsLocalizations.delegate, GlobalWidgetsLocalizations.delegate,
GlobalCupertinoLocalizations.delegate, GlobalCupertinoLocalizations.delegate,