mirror of
https://github.com/SyncrowIOT/web.git
synced 2025-07-15 09:45:25 +00:00
privacy policy fixes
This commit is contained in:
@ -1,3 +1,4 @@
|
|||||||
|
import 'package:flutter/widgets.dart';
|
||||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||||
import 'package:flutter_secure_storage/flutter_secure_storage.dart';
|
import 'package:flutter_secure_storage/flutter_secure_storage.dart';
|
||||||
import 'package:go_router/go_router.dart';
|
import 'package:go_router/go_router.dart';
|
||||||
@ -51,6 +52,8 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
|
|||||||
await const FlutterSecureStorage().read(key: UserModel.userUuidKey);
|
await const FlutterSecureStorage().read(key: UserModel.userUuidKey);
|
||||||
user = await HomeApi().fetchUserInfo(uuid);
|
user = await HomeApi().fetchUserInfo(uuid);
|
||||||
add(FetchTermEvent());
|
add(FetchTermEvent());
|
||||||
|
add(FetchPolicyEvent());
|
||||||
|
|
||||||
emit(HomeInitial());
|
emit(HomeInitial());
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
return;
|
return;
|
||||||
@ -61,7 +64,8 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
|
|||||||
try {
|
try {
|
||||||
emit(LoadingHome());
|
emit(LoadingHome());
|
||||||
terms = await HomeApi().fetchTerms();
|
terms = await HomeApi().fetchTerms();
|
||||||
add(FetchPolicyEvent());
|
emit(HomeInitial());
|
||||||
|
|
||||||
// emit(PolicyAgreement());
|
// emit(PolicyAgreement());
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
return;
|
return;
|
||||||
@ -72,8 +76,11 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
|
|||||||
try {
|
try {
|
||||||
emit(LoadingHome());
|
emit(LoadingHome());
|
||||||
policy = await HomeApi().fetchPolicy();
|
policy = await HomeApi().fetchPolicy();
|
||||||
// emit(PolicyAgreement());
|
debugPrint("Fetched policy: $policy");
|
||||||
|
// Emit a state to trigger the UI update
|
||||||
|
emit(HomeInitial());
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
|
debugPrint("Error fetching policy: $e");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -9,105 +9,126 @@ import 'package:syncrow_web/pages/home/view/home_card.dart';
|
|||||||
import 'package:syncrow_web/utils/constants/assets.dart';
|
import 'package:syncrow_web/utils/constants/assets.dart';
|
||||||
import 'package:syncrow_web/web_layout/web_scaffold.dart';
|
import 'package:syncrow_web/web_layout/web_scaffold.dart';
|
||||||
|
|
||||||
class HomeWebPage extends StatelessWidget {
|
class HomeWebPage extends StatefulWidget {
|
||||||
const HomeWebPage({super.key});
|
const HomeWebPage({super.key});
|
||||||
|
|
||||||
|
@override
|
||||||
|
State<HomeWebPage> createState() => _HomeWebPageState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _HomeWebPageState extends State<HomeWebPage> {
|
||||||
|
// Flag to track whether the dialog is already shown.
|
||||||
|
bool _dialogShown = false;
|
||||||
|
|
||||||
|
@override
|
||||||
|
void initState() {
|
||||||
|
super.initState();
|
||||||
|
final homeBloc = BlocProvider.of<HomeBloc>(context);
|
||||||
|
homeBloc.add(FetchUserInfo());
|
||||||
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
Size size = MediaQuery.of(context).size;
|
Size size = MediaQuery.of(context).size;
|
||||||
final homeBloc = BlocProvider.of<HomeBloc>(context);
|
final homeBloc = BlocProvider.of<HomeBloc>(context);
|
||||||
|
|
||||||
return PopScope(
|
return PopScope(
|
||||||
canPop: false,
|
canPop: false,
|
||||||
onPopInvoked: (didPop) => false,
|
onPopInvoked: (didPop) => false,
|
||||||
child: BlocConsumer<HomeBloc, HomeState>(
|
child: BlocConsumer<HomeBloc, HomeState>(
|
||||||
listener: (BuildContext context, state) {
|
listener: (BuildContext context, state) {
|
||||||
if (state is PolicyAgreement) {
|
print('state=$state');
|
||||||
if (homeBloc.user!.hasAcceptedWebAgreement == false) {
|
if (state is HomeInitial) {
|
||||||
Future.delayed(const Duration(seconds: 1), () {
|
if (homeBloc.user!.hasAcceptedWebAgreement == false &&
|
||||||
showDialog(
|
!_dialogShown) {
|
||||||
context: context,
|
_dialogShown =
|
||||||
barrierDismissible: false,
|
true; // Set the flag to true to indicate the dialog is showing.
|
||||||
builder: (BuildContext context) {
|
Future.delayed(const Duration(seconds: 1), () {
|
||||||
return AgreementAndPrivacyDialog(
|
showDialog(
|
||||||
terms: homeBloc.terms,
|
context: context,
|
||||||
policy: homeBloc.policy,
|
barrierDismissible: false,
|
||||||
);
|
builder: (BuildContext context) {
|
||||||
},
|
return AgreementAndPrivacyDialog(
|
||||||
).then((v) {
|
terms: homeBloc.terms,
|
||||||
if (v != null) {
|
policy: homeBloc.policy,
|
||||||
homeBloc.add(ConfirmUserAgreementEvent());
|
);
|
||||||
homeBloc.add(const FetchUserInfo());
|
},
|
||||||
}
|
).then((v) {
|
||||||
});
|
_dialogShown = false;
|
||||||
|
if (v != null) {
|
||||||
|
homeBloc.add(ConfirmUserAgreementEvent());
|
||||||
|
homeBloc.add(const FetchUserInfo());
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
});
|
||||||
}
|
}
|
||||||
},
|
}
|
||||||
builder: (context, state) {
|
},
|
||||||
return WebScaffold(
|
builder: (context, state) {
|
||||||
enableMenuSidebar: false,
|
return WebScaffold(
|
||||||
appBarTitle: Row(
|
enableMenuSidebar: false,
|
||||||
|
appBarTitle: Row(
|
||||||
|
children: [
|
||||||
|
SvgPicture.asset(
|
||||||
|
Assets.loginLogo,
|
||||||
|
width: 150,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
scaffoldBody: SizedBox(
|
||||||
|
height: size.height,
|
||||||
|
width: size.width,
|
||||||
|
child: Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
children: [
|
children: [
|
||||||
SvgPicture.asset(
|
Column(
|
||||||
Assets.loginLogo,
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
width: 150,
|
crossAxisAlignment: CrossAxisAlignment.center,
|
||||||
|
children: [
|
||||||
|
SizedBox(height: size.height * 0.1),
|
||||||
|
Text(
|
||||||
|
'ACCESS YOUR APPS',
|
||||||
|
style: Theme.of(context)
|
||||||
|
.textTheme
|
||||||
|
.headlineLarge!
|
||||||
|
.copyWith(color: Colors.black, fontSize: 40),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 30),
|
||||||
|
Expanded(
|
||||||
|
flex: 4,
|
||||||
|
child: SizedBox(
|
||||||
|
height: size.height * 0.6,
|
||||||
|
width: size.width * 0.68,
|
||||||
|
child: GridView.builder(
|
||||||
|
itemCount: 3, // Change this count if needed.
|
||||||
|
gridDelegate:
|
||||||
|
const SliverGridDelegateWithFixedCrossAxisCount(
|
||||||
|
crossAxisCount: 3, // Adjust as needed.
|
||||||
|
crossAxisSpacing: 20.0,
|
||||||
|
mainAxisSpacing: 20.0,
|
||||||
|
childAspectRatio: 1.5,
|
||||||
|
),
|
||||||
|
itemBuilder: (context, index) {
|
||||||
|
return HomeCard(
|
||||||
|
index: index,
|
||||||
|
active: homeBloc.homeItems[index].active!,
|
||||||
|
name: homeBloc.homeItems[index].title!,
|
||||||
|
img: homeBloc.homeItems[index].icon!,
|
||||||
|
onTap: () =>
|
||||||
|
homeBloc.homeItems[index].onPress(context),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
scaffoldBody: SizedBox(
|
),
|
||||||
height: size.height,
|
);
|
||||||
width: size.width,
|
},
|
||||||
child: Row(
|
),
|
||||||
mainAxisAlignment: MainAxisAlignment.center,
|
);
|
||||||
children: [
|
|
||||||
Column(
|
|
||||||
mainAxisAlignment: MainAxisAlignment.center,
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.center,
|
|
||||||
children: [
|
|
||||||
SizedBox(height: size.height * 0.1),
|
|
||||||
Text(
|
|
||||||
'ACCESS YOUR APPS',
|
|
||||||
style: Theme.of(context)
|
|
||||||
.textTheme
|
|
||||||
.headlineLarge!
|
|
||||||
.copyWith(color: Colors.black, fontSize: 40),
|
|
||||||
),
|
|
||||||
const SizedBox(height: 30),
|
|
||||||
Expanded(
|
|
||||||
flex: 4,
|
|
||||||
child: SizedBox(
|
|
||||||
height: size.height * 0.6,
|
|
||||||
width: size.width * 0.68,
|
|
||||||
child: GridView.builder(
|
|
||||||
itemCount: 3, //8
|
|
||||||
gridDelegate:
|
|
||||||
const SliverGridDelegateWithFixedCrossAxisCount(
|
|
||||||
crossAxisCount: 3, //4
|
|
||||||
crossAxisSpacing: 20.0,
|
|
||||||
mainAxisSpacing: 20.0,
|
|
||||||
childAspectRatio: 1.5,
|
|
||||||
),
|
|
||||||
itemBuilder: (context, index) {
|
|
||||||
return HomeCard(
|
|
||||||
index: index,
|
|
||||||
active: homeBloc.homeItems[index].active!,
|
|
||||||
name: homeBloc.homeItems[index].title!,
|
|
||||||
img: homeBloc.homeItems[index].icon!,
|
|
||||||
onTap: () => homeBloc.homeItems[index]
|
|
||||||
.onPress(context),
|
|
||||||
);
|
|
||||||
},
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
},
|
|
||||||
));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user