diff --git a/lib/pages/access_management/view/access_management.dart b/lib/pages/access_management/view/access_management.dart index f66c8a99..89bc7032 100644 --- a/lib/pages/access_management/view/access_management.dart +++ b/lib/pages/access_management/view/access_management.dart @@ -30,7 +30,7 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout { final padding = isLargeScreen ? const EdgeInsets.all(30) : const EdgeInsets.all(15); return WebScaffold( - enableMenuSideba: false, + enableMenuSidebar: false, appBarTitle: FittedBox( child: Text( 'Access Management', diff --git a/lib/pages/device_managment/all_devices/view/device_managment_page.dart b/lib/pages/device_managment/all_devices/view/device_managment_page.dart index 93480ae5..8265cd81 100644 --- a/lib/pages/device_managment/all_devices/view/device_managment_page.dart +++ b/lib/pages/device_managment/all_devices/view/device_managment_page.dart @@ -21,13 +21,11 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout { ), ), rightBody: const NavigateHomeGridView(), - enableMenuSideba: isLargeScreenSize(context), scaffoldBody: BlocBuilder( builder: (context, state) { if (state is DeviceManagementLoading) { return const Center(child: CircularProgressIndicator()); - } else if (state is DeviceManagementLoaded || - state is DeviceManagementFiltered) { + } else if (state is DeviceManagementLoaded || state is DeviceManagementFiltered) { final devices = state is DeviceManagementLoaded ? state.devices : (state as DeviceManagementFiltered).filteredDevices; diff --git a/lib/pages/home/view/home_page_mobile.dart b/lib/pages/home/view/home_page_mobile.dart index e8371cf2..560ef0d5 100644 --- a/lib/pages/home/view/home_page_mobile.dart +++ b/lib/pages/home/view/home_page_mobile.dart @@ -18,7 +18,7 @@ class HomeMobilePage extends StatelessWidget { canPop: false, onPopInvoked: (didPop) => false, child: WebScaffold( - enableMenuSideba: false, + enableMenuSidebar: false, appBarTitle: Row( children: [ SvgPicture.asset( @@ -41,8 +41,7 @@ class HomeMobilePage extends StatelessWidget { SizedBox(height: size.height * 0.05), const Text( 'ACCESS YOUR APPS', - style: - TextStyle(fontSize: 20, fontWeight: FontWeight.w700), + style: TextStyle(fontSize: 20, fontWeight: FontWeight.w700), ), const SizedBox(height: 30), Expanded( @@ -52,8 +51,7 @@ class HomeMobilePage extends StatelessWidget { width: size.width * 0.68, child: GridView.builder( itemCount: 8, - gridDelegate: - const SliverGridDelegateWithFixedCrossAxisCount( + gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount( crossAxisCount: 2, crossAxisSpacing: 20.0, mainAxisSpacing: 20.0, @@ -65,8 +63,7 @@ class HomeMobilePage extends StatelessWidget { active: homeItems[index]['active'], name: homeItems[index]['title'], img: homeItems[index]['icon'], - onTap: () => - homeBloc.homeItems[index].onPress(context), + onTap: () => homeBloc.homeItems[index].onPress(context), ); }, ), diff --git a/lib/pages/home/view/home_page_web.dart b/lib/pages/home/view/home_page_web.dart index c1fc54f9..cb806dfc 100644 --- a/lib/pages/home/view/home_page_web.dart +++ b/lib/pages/home/view/home_page_web.dart @@ -20,7 +20,7 @@ class HomeWebPage extends StatelessWidget { builder: (context, state) { final homeBloc = BlocProvider.of(context); return WebScaffold( - enableMenuSideba: false, + enableMenuSidebar: false, appBarTitle: Row( children: [ SvgPicture.asset( diff --git a/lib/pages/visitor_password/bloc/visitor_password_bloc.dart b/lib/pages/visitor_password/bloc/visitor_password_bloc.dart index 4982c7f1..151d6d1f 100644 --- a/lib/pages/visitor_password/bloc/visitor_password_bloc.dart +++ b/lib/pages/visitor_password/bloc/visitor_password_bloc.dart @@ -14,7 +14,6 @@ import 'package:syncrow_web/services/access_mang_api.dart'; import 'package:syncrow_web/utils/color_manager.dart'; import 'package:syncrow_web/utils/constants/assets.dart'; import 'package:syncrow_web/utils/snack_bar.dart'; -import 'package:syncrow_web/utils/style.dart'; class VisitorPasswordBloc extends Bloc { VisitorPasswordBloc() : super(VisitorPasswordInitial()) { @@ -379,17 +378,17 @@ class VisitorPasswordBloc extends Bloc expirationTimeTimeStamp!) { - accessPeriodValidate="Effective Time cannot be later than Expiration Time."; + accessPeriodValidate = "Effective Time cannot be later than Expiration Time."; } else { - accessPeriodValidate=''; + accessPeriodValidate = ''; effectiveTime = selectedDateTime.toString().split('.').first; effectiveTimeTimeStamp = selectedTimestamp; } } else { if (effectiveTimeTimeStamp != null && selectedTimestamp < effectiveTimeTimeStamp!) { - accessPeriodValidate= 'Expiration Time cannot be earlier than Effective Time.'; + accessPeriodValidate = 'Expiration Time cannot be earlier than Effective Time.'; } else { - accessPeriodValidate=''; + accessPeriodValidate = ''; expirationTime = selectedDateTime.toString().split('.').first; expirationTimeTimeStamp = selectedTimestamp; } @@ -449,7 +448,6 @@ class VisitorPasswordBloc extends Bloc[ TextButton( onPressed: () { - Navigator.of(context).pop(true); }, child: const Text('OK'), diff --git a/lib/web_layout/web_scaffold.dart b/lib/web_layout/web_scaffold.dart index b4edd764..c1d6075f 100644 --- a/lib/web_layout/web_scaffold.dart +++ b/lib/web_layout/web_scaffold.dart @@ -6,7 +6,7 @@ import 'package:syncrow_web/web_layout/web_app_bar.dart'; import 'menu_sidebar.dart'; class WebScaffold extends StatelessWidget with HelperResponsiveLayout { - final bool enableMenuSideba; + final bool enableMenuSidebar; final Widget? appBarTitle; final Widget? centerBody; final Widget? rightBody; @@ -17,7 +17,7 @@ class WebScaffold extends StatelessWidget with HelperResponsiveLayout { this.centerBody, this.rightBody, this.scaffoldBody, - this.enableMenuSideba = true, + this.enableMenuSidebar = false, }); @override Widget build(BuildContext context) { @@ -49,7 +49,7 @@ class WebScaffold extends StatelessWidget with HelperResponsiveLayout { Expanded( child: Row( children: [ - if (enableMenuSideba && !isSmall) const MenuSidebar(), + if (enableMenuSidebar && !isSmall) const MenuSidebar(), Expanded(flex: 5, child: scaffoldBody!) ], ),