Nadif
/
TKK_E32232340
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'branch' of https://github.com/kleponijo/klimatologi into branch

This commit is contained in:
Mochamad ongki ramadani 2026-02-14 21:01:38 +07:00
parent 9ec9beda7b 105e2c52d0
commit 80fe215313
5 changed files with 48 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/screens/auth/blocs/sign_up_bloc/sign_up_bloc.dart
View File

@ -16,7 +16,7 @@ class SignUpBloc extends Bloc<SignUpEvent, SignUpState> {
await _userRepository.setUserData(myUser);
emit(SignUpSuccess());
} catch (e) {
emit(SignUpFailure());
emit(SignUpFailure(e.toString()));
}
});
}

11
lib/screens/auth/blocs/sign_up_bloc/sign_up_state.dart
View File

@ -4,11 +4,18 @@ sealed class SignUpState extends Equatable {
const SignUpState();
@override
List<Object> get props => [];
List<Object?> get props => [];
}
final class SignUpInitial extends SignUpState {}
final class SignUpSuccess extends SignUpState {}
final class SignUpFailure extends SignUpState {}
final class SignUpFailure extends SignUpState {
final String? message;
const SignUpFailure([this.message]);
@override
List<Object?> get props => [message];
}
final class SignUpProcess extends SignUpState {}

4
lib/screens/auth/views/sign_in_screen.dart
View File

@ -57,8 +57,6 @@ class _SignInScreenState extends State<SignInScreen> {
validator: (val) {
if (val!.isEmpty) {
return 'Please fill in this field';
} else if (!RegExp(r'^[\w-\.]+@([\w-]+.)+[\w-]{2,4}$').hasMatch(val)) {
return 'Please enter a valid email';
}
return null;
}
@ -77,8 +75,6 @@ class _SignInScreenState extends State<SignInScreen> {
validator: (val) {
if (val!.isEmpty) {
return 'Please fill in this field';
} else if (!RegExp(r'^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[!@#\$&*~`)\%\-(_+=;:,.<>/?"[{\]}\|^]).{8,}$').hasMatch(val)) {
return 'Please enter a valid password';
}
return null;
},

23
lib/screens/auth/views/sign_up_screen.dart
View File

@ -22,6 +22,12 @@ class _SignUpScreenState extends State<SignUpScreen> {
bool obscurePassword = true;
bool signUpRequired = false;
bool containsUpperCase = false;
bool containsLowerCase = false;
bool containsNumber = false;
bool containsSpecialChar = false;
bool contains8Length = false;
@override
Widget build(BuildContext context) {
return BlocListener<SignUpBloc, SignUpState>(
@ -30,12 +36,23 @@ class _SignUpScreenState extends State<SignUpScreen> {
setState(() {
signUpRequired = false;
});
// User sudah terdaftar dan auth state akan otomatis update via AuthenticationBloc
// Tungur sebentar agar Firestore selesai menyimpan data
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(content: Text('Registrasi berhasil! Mengarahkan...')),
);
} else if (state is SignUpProcess) {
setState(() {
signUpRequired = true;
});
} else if (state is SignUpFailure) {
return;
setState(() {
signUpRequired = false;
});
final message = (state as SignUpFailure).message ?? 'Registrasi gagal, silakan coba lagi';
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text(message)),
);
}
},
child: Form(
@ -113,8 +130,6 @@ class _SignUpScreenState extends State<SignUpScreen> {
validator: (val) {
if (val == null || val.isEmpty) {
return 'Please fill in this field';
} else if (!RegExp(r'^[\w-\.]+@([\w-]+\.)+[\w-]{2,4}$').hasMatch(val)) {
return 'Please enter a valid email';
}
return null;
},
@ -145,8 +160,6 @@ class _SignUpScreenState extends State<SignUpScreen> {
validator: (val) {
if (val == null || val.isEmpty) {
return 'Please fill in this field';
} else if (val.length < 6) {
return 'Password minimal 6 karakter';
}
return null;
},

22
packages/user_repository/lib/src/firebase_user_repo.dart
View File

@ -18,8 +18,24 @@ class FirebaseUserRepo implements UserRepository {
if (firebaseUser == null) {
yield MyUser.empty;
} else {
yield await userCollection.doc(firebaseUser.uid).get()
.then((value) => MyUser.fromEntity(MyUserEntity.fromDocument(value.data()!)));
try {
final userData = await userCollection.doc(firebaseUser.uid).get();
if (userData.exists && userData.data() != null) {
yield MyUser.fromEntity(MyUserEntity.fromDocument(userData.data()!));
} else {
// User baru yang belum ada data di Firestore, tunggu sebentar
await Future.delayed(const Duration(milliseconds: 500));
final retryData = await userCollection.doc(firebaseUser.uid).get();
if (retryData.exists && retryData.data() != null) {
yield MyUser.fromEntity(MyUserEntity.fromDocument(retryData.data()!));
} else {
yield MyUser.empty;
}
}
} catch (e) {
log('Error fetching user data: $e');
yield MyUser.empty;
}
}
});
}
@ -63,6 +79,8 @@ class FirebaseUserRepo implements UserRepository {
await userCollection
.doc(myUser.userId)
.set(myUser.toEntity().toDocument());
// Tunggu sebentar agar data tersimpan dengan baik sebelum stream update
await Future.delayed(const Duration(milliseconds: 500));
} catch (e) {
log(e.toString());
rethrow;