handelled the left bar employee names

This commit is contained in:
Vaibhav Surve 2025-05-03 12:08:25 +05:30
parent 48255f0d72
commit 70943aad01
3 changed files with 50 additions and 40 deletions

View File

@ -1,6 +1,8 @@
import 'dart:convert'; import 'dart:convert';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'package:marco/helpers/services/storage/local_storage.dart'; import 'package:marco/helpers/services/storage/local_storage.dart';
import 'package:marco/controller/permission_controller.dart';
import 'package:get/get.dart';
class AuthService { class AuthService {
static bool isLoggedIn = false; static bool isLoggedIn = false;
@ -35,7 +37,7 @@ class AuthService {
// Save the login state in local storage // Save the login state in local storage
await LocalStorage.setLoggedInUser(true); await LocalStorage.setLoggedInUser(true);
Get.put(PermissionController());
// Return null to indicate success // Return null to indicate success
return null; return null;
} else if (response.statusCode == 401) { } else if (response.statusCode == 401) {

View File

@ -11,7 +11,6 @@ import 'package:marco/helpers/theme/theme_customizer.dart';
import 'package:marco/routes.dart'; import 'package:marco/routes.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:url_strategy/url_strategy.dart'; import 'package:url_strategy/url_strategy.dart';
import 'package:marco/controller/permission_controller.dart';
Future<void> main() async { Future<void> main() async {
WidgetsFlutterBinding.ensureInitialized(); WidgetsFlutterBinding.ensureInitialized();
setPathUrlStrategy(); setPathUrlStrategy();
@ -19,7 +18,6 @@ Future<void> main() async {
await LocalStorage.init(); await LocalStorage.init();
AppStyle.init(); AppStyle.init();
await ThemeCustomizer.init(); await ThemeCustomizer.init();
Get.put(PermissionController());
runApp(ChangeNotifierProvider<AppNotifier>( runApp(ChangeNotifierProvider<AppNotifier>(
create: (context) => AppNotifier(), create: (context) => AppNotifier(),
child: MyApp(), child: MyApp(),

View File

@ -56,7 +56,13 @@ class _LeftBarState extends State<LeftBar>
@override @override
void initState() { void initState() {
super.initState(); super.initState();
_loadEmployeeInfo();
}
void _loadEmployeeInfo() {
setState(() {
employeeInfo = LocalStorage.getEmployeeInfo(); employeeInfo = LocalStorage.getEmployeeInfo();
});
} }
@override @override
@ -126,6 +132,10 @@ class _LeftBarState extends State<LeftBar>
} }
Widget userInfoSection() { Widget userInfoSection() {
if (employeeInfo == null) {
return Center(child: CircularProgressIndicator()); // Show loading indicator if employeeInfo is not yet loaded.
}
return Padding( return Padding(
padding: MySpacing.fromLTRB(16, 8, 16, 8), padding: MySpacing.fromLTRB(16, 8, 16, 8),
child: Row( child: Row(