Cleaned up state

Author: maneesht

dataconnect/dataconnect/connector/mutations.gql

@@ -13,20 +13,11 @@ mutation AddFavoritedMovie($movieId: UUID!) @auth(level: USER) {
   favorite_movie_upsert(data: { userId_expr: "auth.uid", movieId: $movieId })
 }
 
-
 # Remove a movie from the user's favorites list
 mutation DeleteFavoritedMovie($movieId: UUID!) @auth(level: USER) {
   favorite_movie_delete(key: { userId_expr: "auth.uid", movieId: $movieId })
 }
 
-# Add a movie to the user's favorites list
-mutation DeleteFavoritedActor($actorId: UUID!) @auth(level: USER) {
-  favorite_actor_delete(key: { userId_expr: "auth.uid", actorId: $actorId })
-}
-mutation DeleteWatchedMovie($movieId: UUID!) @auth(level: USER) {
-  watched_movie_delete(key: { userId_expr: "auth.uid", movieId: $movieId })
-}
-
 # Add a review for a movie
 mutation AddReview($movieId: UUID!, $rating: Int!, $reviewText: String!)
 @auth(level: USER) {

dataconnect/dataconnect/connector/queries.gql

@@ -140,39 +140,13 @@ query GetCurrentUser @auth(level: USER) {
         }
       }
     }
-    favoriteActors: favorite_actors_on_user {
-      actor {
-        id
-        name
-        imageUrl
-      }
-    }
-    watchedMovies: watched_movies_on_user {
-      movie {
-        id
-        title
-        genre
-        imageUrl
-        releaseYear
-        rating
-        description
-        tags
-        metadata: movieMetadatas_on_movie {
-          director
-        }
-      }
-    }
-
   }
 }
 
 query GetMovieInfoForUser($movieId: UUID!) @auth(level: USER) {
   favorite_movie(key: { userId_expr: "auth.uid", movieId: $movieId }) {
     movieId
   }
-  watched_movie(key: { userId_expr: "auth.uid", movieId: $movieId }) {
-    movieId
-  }
 }
 
 

dataconnect/dataconnect/schema/schema.gql

@@ -94,15 +94,3 @@ type FavoriteMovie
   user: User!
   movie: Movie!
 }
-type FavoriteActor
-  @table(name: "FavoriteActors", singular: "favorite_actor", plural: "favorite_actors", key: ["user", "actor"]) {
-  # @ref is implicit
-  user: User!
-  actor: Actor!
-}
-type WatchedMovie
-  @table(name: "WatchedMovies", singular: "watched_movie", plural: "watched_movies", key: ["user", "movie"]) {
-  # @ref is implicit
-  user: User!
-  movie: Movie!
-}

dataconnect/firebase.json

@@ -1,4 +1,43 @@
 {
+  "flutter": {
+    "platforms": {
+      "android": {
+        "default": {
+          "projectId": "quickstart-flutter-cc624",
+          "appId": "1:731568610039:android:2fda8b27330be9447251f2",
+          "fileOutput": "android/app/google-services.json"
+        }
+      },
+      "ios": {
+        "default": {
+          "projectId": "quickstart-flutter-cc624",
+          "appId": "1:731568610039:ios:e78b43f1d75a77d87251f2",
+          "uploadDebugSymbols": false,
+          "fileOutput": "ios/Runner/GoogleService-Info.plist"
+        }
+      },
+      "dart": {
+        "lib/firebase_options.dart": {
+          "projectId": "quickstart-flutter-cc624",
+          "configurations": {
+            "android": "1:731568610039:android:2fda8b27330be9447251f2",
+            "ios": "1:731568610039:ios:e78b43f1d75a77d87251f2",
+            "macos": "1:731568610039:ios:e78b43f1d75a77d87251f2",
+            "web": "1:731568610039:web:2896847d0f5655fb7251f2",
+            "windows": "1:731568610039:web:3c1e404f955f0b467251f2"
+          }
+        }
+      },
+      "macos": {
+        "default": {
+          "projectId": "quickstart-flutter-cc624",
+          "appId": "1:731568610039:ios:e78b43f1d75a77d87251f2",
+          "uploadDebugSymbols": false,
+          "fileOutput": "macos/Runner/GoogleService-Info.plist"
+        }
+      }
+    }
+  },
   "dataconnect": { "source": "dataconnect" },
   "emulators": { "dataconnect": { "port": 9399 }, "auth": { "port": 9400 } }
 }

dataconnect/lib/actor_detail.dart

@@ -1,4 +1,6 @@
+import 'package:dataconnect/movie_state.dart';
 import 'package:dataconnect/movies_connector/movies.dart';
+import 'package:dataconnect/widgets/list_movies.dart';
 import 'package:flutter/material.dart';
 
 class ActorDetail extends StatefulWidget {
@@ -16,10 +18,8 @@ class _ActorDetailState extends State<ActorDetail> {
   @override
   void initState() {
     super.initState();
-    MoviesConnector.instance
-        .getActorById(id: widget.actorId)
-        .execute()
-        .then((value) {
+
+    MovieState.getActorById(widget.actorId).then((value) {
       setState(() {
         loading = false;
         actor = value.data.actor;
@@ -50,28 +50,23 @@ class _ActorDetailState extends State<ActorDetail> {
                 ),
               ),
             ),
-            Expanded(
-                child: Padding(
-              padding: const EdgeInsets.fromLTRB(15, 0, 0, 0),
-              // child: Column(children: [Text(actor!.info!)]),
-            ))
           ]),
-      Row(
-        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-        children: [
-          // TODO(mtewani): Check if the movie has been watched by the user
-          OutlinedButton.icon(
-            onPressed: () {
-              // TODO(mtewani): Check if user is logged in.
-            },
-            icon: const Icon(Icons.favorite),
-            label: const Text('Add To Favorites'),
-          )
-        ],
-      )
     ];
   }
 
+  Widget _buildMainRoles() {
+    return ListMovies(
+        movies: MovieState.convertMainActorDetail(actor!.mainActors),
+        title: "Main Roles");
+  }
+
+  Widget _buildSupportingRoles() {
+    return ListMovies(
+        movies:
+            MovieState.convertSupportingActorDetail(actor!.supportingActors),
+        title: "Supporting Roles");
+  }
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -86,7 +81,11 @@ class _ActorDetailState extends State<ActorDetail> {
                   padding: const EdgeInsets.all(30),
                   child: SingleChildScrollView(
                       child: Column(
-                    children: [..._buildActorInfo()],
+                    children: [
+                      ..._buildActorInfo(),
+                      _buildMainRoles(),
+                      _buildSupportingRoles()
+                    ],
                   )))),
     );
   }

dataconnect/lib/destination.dart

@@ -14,9 +14,8 @@ class Route {
 }
 
 var homePath = Route(path: '/home', label: 'Home', iconData: Icons.home);
-var genrePath = Route(path: '/genres', label: 'Genres', iconData: Icons.list);
 var searchPath =
     Route(path: '/search', label: 'Search', iconData: Icons.search);
 var profilePath =
     Route(path: '/profile', label: 'Profile', iconData: Icons.person);
-var paths = [homePath, genrePath, searchPath, profilePath];
+var paths = [homePath, searchPath, profilePath];