diff --git a/lib/pages/home/view/home_page_web.dart b/lib/pages/home/view/home_page_web.dart index baf18fc2..aad4a3be 100644 --- a/lib/pages/home/view/home_page_web.dart +++ b/lib/pages/home/view/home_page_web.dart @@ -37,12 +37,9 @@ class _HomeWebPageState extends State { onPopInvoked: (didPop) => false, child: BlocConsumer( listener: (BuildContext context, state) { - print('state=$state'); if (state is HomeInitial) { - if (homeBloc.user!.hasAcceptedWebAgreement == false && - !_dialogShown) { - _dialogShown = - true; // Set the flag to true to indicate the dialog is showing. + if (homeBloc.user!.hasAcceptedWebAgreement == false && !_dialogShown) { + _dialogShown = true; // Set the flag to true to indicate the dialog is showing. Future.delayed(const Duration(seconds: 1), () { showDialog( context: context, @@ -101,8 +98,7 @@ class _HomeWebPageState extends State { width: size.width * 0.68, child: GridView.builder( itemCount: 3, // Change this count if needed. - gridDelegate: - const SliverGridDelegateWithFixedCrossAxisCount( + gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount( crossAxisCount: 3, // Adjust as needed. crossAxisSpacing: 20.0, mainAxisSpacing: 20.0, @@ -114,8 +110,7 @@ class _HomeWebPageState extends State { active: homeBloc.homeItems[index].active!, name: homeBloc.homeItems[index].title!, img: homeBloc.homeItems[index].icon!, - onTap: () => - homeBloc.homeItems[index].onPress(context), + onTap: () => homeBloc.homeItems[index].onPress(context), ); }, ), diff --git a/lib/pages/roles_and_permission/users_page/add_user_dialog/view/add_user_dialog.dart b/lib/pages/roles_and_permission/users_page/add_user_dialog/view/add_user_dialog.dart index e4cf6107..1a487830 100644 --- a/lib/pages/roles_and_permission/users_page/add_user_dialog/view/add_user_dialog.dart +++ b/lib/pages/roles_and_permission/users_page/add_user_dialog/view/add_user_dialog.dart @@ -26,126 +26,118 @@ class _AddNewUserDialogState extends State { create: (BuildContext context) => UsersBloc() ..add(const LoadCommunityAndSpacesEvent()) ..add(const RoleEvent()), - child: BlocConsumer(listener: (context, state) { - // print('88888==${state}'); - // if (state is SpacesLoadedState) { - // print('object'); - // _blocRole.add(const CheckRoleStepStatus()); - // } - }, builder: (context, state) { - final _blocRole = BlocProvider.of(context); + child: BlocConsumer( + listener: (context, state) {}, + builder: (context, state) { + final _blocRole = BlocProvider.of(context); - return Dialog( - child: Container( - decoration: const BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.all(Radius.circular(20))), - width: 900, - child: Column( - children: [ - // Title - const Padding( - padding: EdgeInsets.all(8.0), - child: SizedBox( - child: Text( - "Add New User", - style: TextStyle( - fontSize: 20, - fontWeight: FontWeight.w700, - color: ColorsManager.secondaryColor), - ), - ), - ), - const Divider(), - Expanded( - child: Row( - children: [ - Expanded( - child: Container( - padding: const EdgeInsets.all(20), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - _buildStep1Indicator(1, "Basics", _blocRole), - _buildStep2Indicator(2, "Spaces", _blocRole), - _buildStep3Indicator( - 3, "Role & Permissions", _blocRole), - ], - ), - ), - ), - Container( - width: 1, - color: ColorsManager.grayBorder, - ), - Expanded( - flex: 2, - child: Padding( - padding: const EdgeInsets.all(20.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - const SizedBox(height: 10), - Expanded( - child: _getFormContent(), - ), - const SizedBox(height: 20), - ], - ), - ), - ), - ], - ), - ), - const Divider(), - Padding( - padding: const EdgeInsets.all(8.0), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceAround, - children: [ - InkWell( - onTap: () { - Navigator.of(context).pop(); - }, - child: const Text("Cancel"), - ), - InkWell( - onTap: () { - _blocRole.add(const CheckEmailEvent()); - - setState(() { - if (currentStep < 3) { - currentStep++; - if (currentStep == 2) { - _blocRole.add( - const CheckStepStatus(isEditUser: false)); - } else if (currentStep == 3) { - _blocRole.add(const CheckSpacesStepStatus()); - } - } else { - _blocRole.add(SendInviteUsers(context: context)); - } - }); - }, + return Dialog( + child: Container( + decoration: const BoxDecoration( + color: Colors.white, borderRadius: BorderRadius.all(Radius.circular(20))), + width: 900, + child: Column( + children: [ + // Title + const Padding( + padding: EdgeInsets.all(8.0), + child: SizedBox( child: Text( - currentStep < 3 ? "Next" : "Save", + "Add New User", style: TextStyle( - color: (_blocRole.isCompleteSpaces == false || - _blocRole.isCompleteBasics == false || - _blocRole.isCompleteRolePermissions == - false) && - currentStep == 3 - ? ColorsManager.grayColor - : ColorsManager.secondaryColor), + fontSize: 20, + fontWeight: FontWeight.w700, + color: ColorsManager.secondaryColor), ), ), - ], - ), + ), + const Divider(), + Expanded( + child: Row( + children: [ + Expanded( + child: Container( + padding: const EdgeInsets.all(20), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + _buildStep1Indicator(1, "Basics", _blocRole), + _buildStep2Indicator(2, "Spaces", _blocRole), + _buildStep3Indicator(3, "Role & Permissions", _blocRole), + ], + ), + ), + ), + Container( + width: 1, + color: ColorsManager.grayBorder, + ), + Expanded( + flex: 2, + child: Padding( + padding: const EdgeInsets.all(20.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const SizedBox(height: 10), + Expanded( + child: _getFormContent(), + ), + const SizedBox(height: 20), + ], + ), + ), + ), + ], + ), + ), + const Divider(), + Padding( + padding: const EdgeInsets.all(8.0), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceAround, + children: [ + InkWell( + onTap: () { + Navigator.of(context).pop(); + }, + child: const Text("Cancel"), + ), + InkWell( + onTap: () { + _blocRole.add(const CheckEmailEvent()); + + setState(() { + if (currentStep < 3) { + currentStep++; + if (currentStep == 2) { + _blocRole.add(const CheckStepStatus(isEditUser: false)); + } else if (currentStep == 3) { + _blocRole.add(const CheckSpacesStepStatus()); + } + } else { + _blocRole.add(SendInviteUsers(context: context)); + } + }); + }, + child: Text( + currentStep < 3 ? "Next" : "Save", + style: TextStyle( + color: (_blocRole.isCompleteSpaces == false || + _blocRole.isCompleteBasics == false || + _blocRole.isCompleteRolePermissions == false) && + currentStep == 3 + ? ColorsManager.grayColor + : ColorsManager.secondaryColor), + ), + ), + ], + ), + ), + ], ), - ], - ), - )); - })); + )); + })); } Widget _getFormContent() { @@ -204,12 +196,8 @@ class _AddNewUserDialogState extends State { label, style: TextStyle( fontSize: 16, - color: currentStep == step - ? ColorsManager.blackColor - : ColorsManager.greyColor, - fontWeight: currentStep == step - ? FontWeight.bold - : FontWeight.normal, + color: currentStep == step ? ColorsManager.blackColor : ColorsManager.greyColor, + fontWeight: currentStep == step ? FontWeight.bold : FontWeight.normal, ), ), ], @@ -272,12 +260,8 @@ class _AddNewUserDialogState extends State { label, style: TextStyle( fontSize: 16, - color: currentStep == step - ? ColorsManager.blackColor - : ColorsManager.greyColor, - fontWeight: currentStep == step - ? FontWeight.bold - : FontWeight.normal, + color: currentStep == step ? ColorsManager.blackColor : ColorsManager.greyColor, + fontWeight: currentStep == step ? FontWeight.bold : FontWeight.normal, ), ), ], @@ -334,12 +318,8 @@ class _AddNewUserDialogState extends State { label, style: TextStyle( fontSize: 16, - color: currentStep == step - ? ColorsManager.blackColor - : ColorsManager.greyColor, - fontWeight: currentStep == step - ? FontWeight.bold - : FontWeight.normal, + color: currentStep == step ? ColorsManager.blackColor : ColorsManager.greyColor, + fontWeight: currentStep == step ? FontWeight.bold : FontWeight.normal, ), ), ], diff --git a/lib/services/user_permission.dart b/lib/services/user_permission.dart index f3088794..e4f097f4 100644 --- a/lib/services/user_permission.dart +++ b/lib/services/user_permission.dart @@ -34,9 +34,8 @@ class UserPermissionApi { path: ApiEndpoints.roleTypes, showServerMessage: true, expectedResponseModel: (json) { - final List fetchedRoles = (json['data'] as List) - .map((item) => RoleTypeModel.fromJson(item)) - .toList(); + final List fetchedRoles = + (json['data'] as List).map((item) => RoleTypeModel.fromJson(item)).toList(); return fetchedRoles; }, ); @@ -48,9 +47,7 @@ class UserPermissionApi { path: ApiEndpoints.permission.replaceAll("roleUuid", roleUuid), showServerMessage: true, expectedResponseModel: (json) { - return (json as List) - .map((data) => PermissionOption.fromJson(data)) - .toList(); + return (json as List).map((data) => PermissionOption.fromJson(data)).toList(); }, ); return response ?? []; @@ -88,7 +85,6 @@ class UserPermissionApi { } }, ); - print('sendInviteUser=$body'); return response ?? []; } on DioException catch (e) { @@ -196,12 +192,9 @@ class UserPermissionApi { "disable": status, "projectUuid": "0e62577c-06fa-41b9-8a92-99a21fbaf51c" }; - print('changeUserStatusById==$bodya'); - print('changeUserStatusById==$userUuid'); final response = await _httpService.put( - path: ApiEndpoints.changeUserStatus - .replaceAll("{invitedUserUuid}", userUuid), + path: ApiEndpoints.changeUserStatus.replaceAll("{invitedUserUuid}", userUuid), body: bodya, expectedResponseModel: (json) { return json['success'];