Skip to content

Commit b9da841

Browse files
committed
Fixed the displays'
1 parent 6623e3e commit b9da841

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

data_connect/lib/profile.dart

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,16 @@ class Profile extends StatelessWidget {
2020
stream: MovieState.subscribeToCurrentUser(),
2121
builder: (context, snapshot) {
2222
final res = snapshot.data;
23-
if (res == null) {
23+
if (res == null || res.data.user == null) {
2424
return const Center(
2525
child: CircularProgressIndicator(),
2626
);
2727
}
28-
final displayName = Auth.instance.currentUser?.displayName;
28+
final displayName =
29+
FirebaseAuth.instance.currentUser?.displayName ?? '';
2930
final favoriteMovies =
3031
res.data.user!.favoriteMovies.map((e) => e.movie).toList();
31-
final reviews = res.data.user!.reviews;
32+
final reviews = res.data.user == null ? [] : res.data.user!.reviews;
3233
return RefreshIndicator(
3334
child: SingleChildScrollView(
3435
physics: const AlwaysScrollableScrollPhysics(),
@@ -40,7 +41,7 @@ class Profile extends StatelessWidget {
4041
children: [
4142
Column(
4243
children: [
43-
Text('Welcome back $displayName !'),
44+
Text('Welcome back $displayName!'),
4445
TextButton(
4546
onPressed: () async {
4647
FirebaseAuth.instance.signOut();

data_connect/lib/sign_up.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import 'package:dataconnect/movie_state.dart';
12
import 'package:dataconnect/movies_connector/movies.dart';
23
import 'package:dataconnect/widgets/auth_dialog.dart';
34
import 'package:firebase_auth/firebase_auth.dart';
@@ -25,6 +26,7 @@ class _SignUpState extends State<SignUp> {
2526
email: _username, password: _password);
2627
await FirebaseAuth.instance.currentUser!.updateDisplayName(_name);
2728
await MoviesConnector.instance.upsertUser(username: _username).execute();
29+
MovieState.triggerUpdateFavorite();
2830
if (mounted) {
2931
context.go('/home');
3032
}

0 commit comments

Comments
 (0)