removed login flow code
This commit is contained in:
parent
b1b5b52854
commit
3f3185c2f4
@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
import 'package:marco/controller/my_controller.dart';
|
import 'package:marco/controller/my_controller.dart';
|
||||||
@ -79,6 +80,7 @@ class LoginController extends MyController {
|
|||||||
enableRemoteLogging();
|
enableRemoteLogging();
|
||||||
logSafe("✅ Remote logging enabled after login.");
|
logSafe("✅ Remote logging enabled after login.");
|
||||||
|
|
||||||
|
|
||||||
final fcmToken = await LocalStorage.getFcmToken();
|
final fcmToken = await LocalStorage.getFcmToken();
|
||||||
if (fcmToken?.isNotEmpty ?? false) {
|
if (fcmToken?.isNotEmpty ?? false) {
|
||||||
final success = await AuthService.registerDeviceToken(fcmToken!);
|
final success = await AuthService.registerDeviceToken(fcmToken!);
|
||||||
@ -89,9 +91,9 @@ class LoginController extends MyController {
|
|||||||
level: LogLevel.warning);
|
level: LogLevel.warning);
|
||||||
}
|
}
|
||||||
|
|
||||||
logSafe("Login successful for user: ${loginData['username']}");
|
|
||||||
|
|
||||||
Get.toNamed('/select_tenant');
|
logSafe("Login successful for user: ${loginData['username']}");
|
||||||
|
Get.toNamed('/home');
|
||||||
}
|
}
|
||||||
} catch (e, stacktrace) {
|
} catch (e, stacktrace) {
|
||||||
logSafe("Exception during login",
|
logSafe("Exception during login",
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
import 'package:flutter/material.dart';
|
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/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/login_screen.dart';
|
||||||
import 'package:marco/view/auth/register_account_screen.dart';
|
import 'package:marco/view/auth/register_account_screen.dart';
|
||||||
@ -20,21 +20,13 @@ 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';
|
||||||
import 'package:marco/view/tenant/tenant_selection_screen.dart';
|
|
||||||
|
|
||||||
class AuthMiddleware extends GetMiddleware {
|
class AuthMiddleware extends GetMiddleware {
|
||||||
@override
|
@override
|
||||||
RouteSettings? redirect(String? route) {
|
RouteSettings? redirect(String? route) {
|
||||||
if (!AuthService.isLoggedIn) {
|
return AuthService.isLoggedIn
|
||||||
if (route != '/auth/login-option') {
|
? null
|
||||||
return const RouteSettings(name: '/auth/login-option');
|
: RouteSettings(name: '/auth/login-option');
|
||||||
}
|
|
||||||
} else if (!TenantService.isTenantSelected) {
|
|
||||||
if (route != '/select-tenant') {
|
|
||||||
return const RouteSettings(name: '/select-tenant');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -49,10 +41,6 @@ getPageRoute() {
|
|||||||
page: () => DashboardScreen(), // or your actual home screen
|
page: () => DashboardScreen(), // or your actual home screen
|
||||||
middlewares: [AuthMiddleware()],
|
middlewares: [AuthMiddleware()],
|
||||||
),
|
),
|
||||||
GetPage(
|
|
||||||
name: '/select-tenant',
|
|
||||||
page: () => const TenantSelectionScreen(),
|
|
||||||
middlewares: [AuthMiddleware()]),
|
|
||||||
|
|
||||||
// Dashboard
|
// Dashboard
|
||||||
GetPage(
|
GetPage(
|
||||||
@ -80,12 +68,12 @@ getPageRoute() {
|
|||||||
name: '/dashboard/directory-main-page',
|
name: '/dashboard/directory-main-page',
|
||||||
page: () => DirectoryMainScreen(),
|
page: () => DirectoryMainScreen(),
|
||||||
middlewares: [AuthMiddleware()]),
|
middlewares: [AuthMiddleware()]),
|
||||||
// Expense
|
// Expense
|
||||||
GetPage(
|
GetPage(
|
||||||
name: '/dashboard/expense-main-page',
|
name: '/dashboard/expense-main-page',
|
||||||
page: () => ExpenseMainScreen(),
|
page: () => ExpenseMainScreen(),
|
||||||
middlewares: [AuthMiddleware()]),
|
middlewares: [AuthMiddleware()]),
|
||||||
// Documents
|
// Documents
|
||||||
GetPage(
|
GetPage(
|
||||||
name: '/dashboard/document-main-page',
|
name: '/dashboard/document-main-page',
|
||||||
page: () => UserDocumentsPage(),
|
page: () => UserDocumentsPage(),
|
||||||
|
@ -9,10 +9,8 @@ import 'package:marco/helpers/widgets/my_text.dart';
|
|||||||
import 'package:marco/helpers/widgets/avatar.dart';
|
import 'package:marco/helpers/widgets/avatar.dart';
|
||||||
import 'package:marco/model/employees/employee_info.dart';
|
import 'package:marco/model/employees/employee_info.dart';
|
||||||
import 'package:marco/controller/auth/mpin_controller.dart';
|
import 'package:marco/controller/auth/mpin_controller.dart';
|
||||||
import 'package:marco/controller/tenant/tenant_selection_controller.dart';
|
|
||||||
import 'package:marco/view/employees/employee_profile_screen.dart';
|
import 'package:marco/view/employees/employee_profile_screen.dart';
|
||||||
import 'package:marco/helpers/services/tenant_service.dart';
|
|
||||||
import 'package:marco/view/tenant/tenant_selection_screen.dart';
|
|
||||||
|
|
||||||
class UserProfileBar extends StatefulWidget {
|
class UserProfileBar extends StatefulWidget {
|
||||||
final bool isCondensed;
|
final bool isCondensed;
|
||||||
@ -27,20 +25,13 @@ class _UserProfileBarState extends State<UserProfileBar>
|
|||||||
late EmployeeInfo employeeInfo;
|
late EmployeeInfo employeeInfo;
|
||||||
bool _isLoading = true;
|
bool _isLoading = true;
|
||||||
bool hasMpin = true;
|
bool hasMpin = true;
|
||||||
late final TenantSelectionController _tenantController;
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void initState() {
|
void initState() {
|
||||||
super.initState();
|
super.initState();
|
||||||
_tenantController = Get.put(TenantSelectionController());
|
|
||||||
_initData();
|
_initData();
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
|
||||||
void dispose() {
|
|
||||||
Get.delete<TenantSelectionController>();
|
|
||||||
super.dispose();
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<void> _initData() async {
|
Future<void> _initData() async {
|
||||||
employeeInfo = LocalStorage.getEmployeeInfo()!;
|
employeeInfo = LocalStorage.getEmployeeInfo()!;
|
||||||
@ -91,10 +82,6 @@ class _UserProfileBarState extends State<UserProfileBar>
|
|||||||
_isLoading
|
_isLoading
|
||||||
? const _LoadingSection()
|
? const _LoadingSection()
|
||||||
: _userProfileSection(isCondensed),
|
: _userProfileSection(isCondensed),
|
||||||
|
|
||||||
// --- SWITCH TENANT ROW BELOW AVATAR ---
|
|
||||||
if (!_isLoading && !isCondensed) _switchTenantRow(),
|
|
||||||
|
|
||||||
MySpacing.height(12),
|
MySpacing.height(12),
|
||||||
Divider(
|
Divider(
|
||||||
indent: 18,
|
indent: 18,
|
||||||
@ -121,118 +108,6 @@ class _UserProfileBarState extends State<UserProfileBar>
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Row widget to switch tenant with popup menu (button only)
|
|
||||||
Widget _switchTenantRow() {
|
|
||||||
return Padding(
|
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
|
|
||||||
child: Obx(() {
|
|
||||||
if (_tenantController.isLoading.value) return _loadingTenantContainer();
|
|
||||||
|
|
||||||
final tenants = _tenantController.tenants;
|
|
||||||
if (tenants.isEmpty) return _noTenantContainer();
|
|
||||||
|
|
||||||
final selectedTenant = TenantService.currentTenant;
|
|
||||||
|
|
||||||
// Sort tenants: selected tenant first
|
|
||||||
final sortedTenants = List.of(tenants);
|
|
||||||
if (selectedTenant != null) {
|
|
||||||
sortedTenants.sort((a, b) {
|
|
||||||
if (a.id == selectedTenant.id) return -1;
|
|
||||||
if (b.id == selectedTenant.id) return 1;
|
|
||||||
return 0;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
return PopupMenuButton<String>(
|
|
||||||
onSelected: (tenantId) =>
|
|
||||||
_tenantController.onTenantSelected(tenantId),
|
|
||||||
itemBuilder: (_) => sortedTenants.map((tenant) {
|
|
||||||
return PopupMenuItem(
|
|
||||||
value: tenant.id,
|
|
||||||
child: Row(
|
|
||||||
children: [
|
|
||||||
ClipRRect(
|
|
||||||
borderRadius: BorderRadius.circular(8),
|
|
||||||
child: Container(
|
|
||||||
width: 20,
|
|
||||||
height: 20,
|
|
||||||
color: Colors.grey.shade200,
|
|
||||||
child: TenantLogo(logoImage: tenant.logoImage),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
const SizedBox(width: 10),
|
|
||||||
Expanded(
|
|
||||||
child: Text(
|
|
||||||
tenant.name,
|
|
||||||
maxLines: 1,
|
|
||||||
overflow: TextOverflow.ellipsis,
|
|
||||||
style: TextStyle(
|
|
||||||
fontWeight: tenant.id == selectedTenant?.id
|
|
||||||
? FontWeight.bold
|
|
||||||
: FontWeight.w600,
|
|
||||||
color: tenant.id == selectedTenant?.id
|
|
||||||
? Colors.blueAccent
|
|
||||||
: Colors.black87,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
if (tenant.id == selectedTenant?.id)
|
|
||||||
const Icon(Icons.check_circle,
|
|
||||||
color: Colors.blueAccent, size: 18),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}).toList(),
|
|
||||||
child: Padding(
|
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10),
|
|
||||||
child: Row(
|
|
||||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
|
||||||
children: [
|
|
||||||
Icon(Icons.swap_horiz, color: Colors.blue.shade600),
|
|
||||||
Expanded(
|
|
||||||
child: Padding(
|
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 6),
|
|
||||||
child: Text(
|
|
||||||
"Switch Organization",
|
|
||||||
maxLines: 1,
|
|
||||||
overflow: TextOverflow.ellipsis,
|
|
||||||
style: TextStyle(
|
|
||||||
color: Colors.blue, fontWeight: FontWeight.bold),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
Icon(Icons.arrow_drop_down, color: Colors.blue.shade600),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
Widget _loadingTenantContainer() => Container(
|
|
||||||
padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 16),
|
|
||||||
decoration: BoxDecoration(
|
|
||||||
color: Colors.blue.shade50,
|
|
||||||
borderRadius: BorderRadius.circular(12),
|
|
||||||
border: Border.all(color: Colors.blue.shade200, width: 1),
|
|
||||||
),
|
|
||||||
child: const Center(child: CircularProgressIndicator(strokeWidth: 2)),
|
|
||||||
);
|
|
||||||
|
|
||||||
Widget _noTenantContainer() => Container(
|
|
||||||
padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 16),
|
|
||||||
decoration: BoxDecoration(
|
|
||||||
color: Colors.blue.shade50,
|
|
||||||
borderRadius: BorderRadius.circular(12),
|
|
||||||
border: Border.all(color: Colors.blue.shade200, width: 1),
|
|
||||||
),
|
|
||||||
child: MyText.bodyMedium(
|
|
||||||
"No tenants available",
|
|
||||||
color: Colors.blueAccent,
|
|
||||||
fontWeight: 600,
|
|
||||||
),
|
|
||||||
);
|
|
||||||
|
|
||||||
Widget _userProfileSection(bool condensed) {
|
Widget _userProfileSection(bool condensed) {
|
||||||
final padding = MySpacing.fromLTRB(
|
final padding = MySpacing.fromLTRB(
|
||||||
|
Loading…
x
Reference in New Issue
Block a user