Squashed commit of the following:

commit 9f42763 Merge: 6b8ba1a 04c2de6 Author: darkhan.nausharipov <darkhan.nausharipov@kzn.akvelon.com> Date: Tue Mar 14 20:05:42 2023 +0600 Merge branch 'master' into issue25255-delete-account commit 6b8ba1a Author: darkhan.nausharipov <darkhan.nausharipov@kzn.akvelon.com> Date: Wed Feb 22 21:41:34 2023 +0600 flutter v3.7 support (apache#25255) commit dc44ba7 Merge: 3f3747c 8cfee7d Author: darkhan.nausharipov <darkhan.nausharipov@kzn.akvelon.com> Date: Wed Feb 22 21:34:45 2023 +0600 Merge branch 'master' into issue25255-delete-account commit 3f3747c Author: darkhan.nausharipov <darkhan.nausharipov@kzn.akvelon.com> Date: Tue Feb 14 18:28:43 2023 +0600 comment fixes (apache#25255) commit a5110e4 Author: darkhan.nausharipov <darkhan.nausharipov@kzn.akvelon.com> Date: Tue Feb 14 11:00:55 2023 +0600 progress dialog is undismissible (apache#25255) commit 2cb7c58 Author: darkhan.nausharipov <darkhan.nausharipov@kzn.akvelon.com> Date: Mon Feb 13 22:50:18 2023 +0600 updated to app_state 0.9.2 (apache#25255) commit 7626f8f Author: darkhan.nausharipov <darkhan.nausharipov@kzn.akvelon.com> Date: Mon Feb 13 22:40:25 2023 +0600 pop progress dialog with navigatorKey (apache#25255) commit 12882fb Author: darkhan.nausharipov <darkhan.nausharipov@kzn.akvelon.com> Date: Fri Feb 10 21:46:08 2023 +0600 addressing review (apache#25255) commit 440d0b0 Author: darkhan.nausharipov <darkhan.nausharipov@kzn.akvelon.com> Date: Fri Feb 10 21:17:03 2023 +0600 addressing review comments (apache#25255) commit 6005103 Author: darkhan.nausharipov <darkhan.nausharipov@kzn.akvelon.com> Date: Fri Feb 10 15:13:54 2023 +0600 addressing review comments (apache#25255) commit fde6ace Author: darkhan.nausharipov <darkhan.nausharipov@kzn.akvelon.com> Date: Thu Feb 9 21:18:15 2023 +0600 showOverlay (apache#25255) commit 09a5526 Author: darkhan.nausharipov <darkhan.nausharipov@kzn.akvelon.com> Date: Thu Feb 9 20:08:48 2023 +0600 addException in deleteAccount (apache#25255) commit a2f43bf Author: darkhan.nausharipov <darkhan.nausharipov@kzn.akvelon.com> Date: Thu Feb 9 20:00:04 2023 +0600 BeamRouterDelegate for showing toasts (apache#25255) commit f1a2cec Author: darkhan.nausharipov <darkhan.nausharipov@kzn.akvelon.com> Date: Thu Feb 9 19:54:12 2023 +0600 comment fixes (apache#25255) commit 8c3e4b5 Author: darkhan.nausharipov <darkhan.nausharipov@kzn.akvelon.com> Date: Thu Feb 9 14:40:07 2023 +0600 toastNotifier todo (apache#25255) commit eda3f16 Author: darkhan.nausharipov <darkhan.nausharipov@kzn.akvelon.com> Date: Thu Feb 9 14:39:43 2023 +0600 showProgressOverlay (apache#25255) commit 2ab46ec Author: darkhan.nausharipov <darkhan.nausharipov@kzn.akvelon.com> Date: Wed Feb 8 19:07:00 2023 +0600 GitHub auth untested (apache#25255) commit 17b8c42 Author: darkhan.nausharipov <darkhan.nausharipov@kzn.akvelon.com> Date: Tue Feb 7 14:51:56 2023 +0600 comment fixes (apache#25255) commit bc4d930 Author: darkhan.nausharipov <darkhan.nausharipov@kzn.akvelon.com> Date: Mon Feb 6 23:05:50 2023 +0600 todo (apache#25255) commit d67cf47 Author: darkhan.nausharipov <darkhan.nausharipov@kzn.akvelon.com> Date: Mon Feb 6 22:51:55 2023 +0600 pre-review fixes (apache#25255) commit eda0bfe Author: darkhan.nausharipov <darkhan.nausharipov@kzn.akvelon.com> Date: Mon Feb 6 22:39:12 2023 +0600 delete my account (apache#25255) commit a34b170 Merge: aee2c84 f9f8c3a Author: darkhan.nausharipov <darkhan.nausharipov@kzn.akvelon.com> Date: Mon Feb 6 21:05:19 2023 +0600 hint warning (apache#25116) commit f9f8c3a Author: darkhan.nausharipov <darkhan.nausharipov@kzn.akvelon.com> Date: Mon Feb 6 21:03:21 2023 +0600 text and popup (apache#25116)
akvelon · Mar 28, 2023 · 53a36cb · 53a36cb
1 parent fc7a240
commit 53a36cb
Show file tree

Hide file tree

Showing 23 changed files with 726 additions and 251 deletions.
diff --git a/learning/tour-of-beam/frontend/assets/translations/en.yaml b/learning/tour-of-beam/frontend/assets/translations/en.yaml
@@ -18,16 +18,16 @@
 ui:
   about: About Tour of Beam
   builtWith: Built with Apache Beam
+  cancel: Cancel
   continueGitHub: Continue with GitHub
   continueGoogle: Continue with Google
   copyright: © The Apache Software Foundation
-  hint: Hint
-  deleteAccount: Delete my account
+  deleteMyAccount: Delete my account
+  deleteTobAccount: Delete my Tour of Beam account
   privacyPolicy: Privacy Policy
   reportIssue: Report Issue in GitHub
   signIn: Sign in
   signOut: Sign out
-  solution: Solution
   toWebsite: To Apache Beam website
 
 pages:
@@ -38,11 +38,17 @@ pages:
     startTour: Start your tour
     title: Welcome to the Tour of Beam!
   tour:
+    assignment: Assignment
     completeUnit: Complete Unit
+    hint: Hint
+    showSolution: Show the solution
+    solution: Solution
+    solveYourself: Before revealing the solution, try solving the challenge on your own. Remember, the more you practice, the better you will become. Give it a shot and see how far you can get.
     summaryTitle: Table of Contents
 
 dialogs:
   signInIf: If you would like to save your progress and track completed modules
+  deleteAccountWarning: Are you sure you want to delete your Tour of Beam account? This will permanently erase your learning progress.
 
 complexity:
   basic: Basic level

diff --git a/learning/tour-of-beam/frontend/lib/auth/notifier.dart b/learning/tour-of-beam/frontend/lib/auth/notifier.dart
@@ -21,9 +21,14 @@ import 'dart:async';
 import 'package:firebase_auth/firebase_auth.dart';
 import 'package:firebase_auth_platform_interface/firebase_auth_platform_interface.dart';
 import 'package:flutter/material.dart';
+import 'package:playground_components/playground_components.dart';
+
+import '../repositories/client/client.dart';
 
 class AuthNotifier extends ChangeNotifier {
-  AuthNotifier() {
+  final TobClient client;
+
+  AuthNotifier({required this.client}) {
     FirebaseAuth.instance.authStateChanges().listen((user) {
       notifyListeners();
     });
@@ -36,10 +41,23 @@ class AuthNotifier extends ChangeNotifier {
   }
 
   Future<void> logIn(AuthProvider authProvider) async {
-    await FirebaseAuth.instance.signInWithPopup(authProvider);
+    try {
+      await FirebaseAuth.instance.signInWithPopup(authProvider);
+    } on Exception catch (e) {
+      PlaygroundComponents.toastNotifier.addException(e);
+    }
   }
 
   Future<void> logOut() async {
     await FirebaseAuth.instance.signOut();
   }
+
+  Future<void> deleteAccount() async {
+    try {
+      await client.postDeleteUserProgress();
+      await FirebaseAuth.instance.currentUser?.delete();
+    } on Exception catch (e) {
+      PlaygroundComponents.toastNotifier.addException(e);
+    }
+  }
 }
diff --git a/learning/tour-of-beam/frontend/lib/components/login/button.dart b/learning/tour-of-beam/frontend/lib/components/login/button.dart
@@ -30,7 +30,7 @@ class LoginButton extends StatelessWidget {
     return TextButton(
       onPressed: () {
         final closeNotifier = PublicNotifier();
-        openOverlay(
+        showOverlay(
           context: context,
           closeNotifier: closeNotifier,
           positioned: Positioned(

diff --git a/learning/tour-of-beam/frontend/lib/components/login/content.dart b/learning/tour-of-beam/frontend/lib/components/login/content.dart
@@ -84,10 +84,13 @@ class _BrandedLoginButtons extends StatelessWidget {
     required this.onLoggedIn,
   });
 
+  Future<void> _logIn(AuthProvider authProvider) async {
+    await GetIt.instance.get<AuthNotifier>().logIn(authProvider);
+    onLoggedIn();
+  }
+
   @override
   Widget build(BuildContext context) {
-    final authNotifier = GetIt.instance.get<AuthNotifier>();
-
     final isLightTheme = Theme.of(context).brightness == Brightness.light;
     final textStyle =
         MaterialStatePropertyAll(Theme.of(context).textTheme.bodyMedium);
@@ -124,16 +127,17 @@ class _BrandedLoginButtons extends StatelessWidget {
     return Column(
       children: [
         ElevatedButton.icon(
-          onPressed: () {},
+          onPressed: () {
+            _logIn(GithubAuthProvider());
+          },
           style: isLightTheme ? githubLightButtonStyle : darkButtonStyle,
           icon: SvgPicture.asset(Assets.svg.githubLogo),
           label: const Text('ui.continueGitHub').tr(),
         ),
         const SizedBox(height: BeamSizes.size16),
         ElevatedButton.icon(
-          onPressed: () async {
-            await authNotifier.logIn(GoogleAuthProvider());
-            onLoggedIn();
+          onPressed: () {
+            _logIn(GoogleAuthProvider());
           },
           style: isLightTheme ? googleLightButtonStyle : darkButtonStyle,
           icon: SvgPicture.asset(Assets.svg.googleLogo),

diff --git a/learning/tour-of-beam/frontend/lib/components/profile/avatar.dart b/learning/tour-of-beam/frontend/lib/components/profile/avatar.dart
@@ -32,7 +32,7 @@ class Avatar extends StatelessWidget {
     return GestureDetector(
       onTap: () {
         final closeNotifier = PublicNotifier();
-        openOverlay(
+        showOverlay(
           context: context,
           closeNotifier: closeNotifier,
           positioned: Positioned(

diff --git a/learning/tour-of-beam/frontend/lib/components/profile/user_menu.dart b/learning/tour-of-beam/frontend/lib/components/profile/user_menu.dart
@@ -125,9 +125,24 @@ class _Buttons extends StatelessWidget {
         ),
         const BeamDivider(),
         _IconLabel(
-          onTap: () {},
+          onTap: () async {
+            closeOverlayCallback();
+            final confirmed = await ConfirmDialog.show(
+              context: context,
+              confirmButtonText: 'ui.deleteMyAccount'.tr(),
+              subtitle: 'dialogs.deleteAccountWarning'.tr(),
+              title: 'ui.deleteTobAccount'.tr(),
+            );
+            if (confirmed) {
+              ProgressDialog.show(
+                future: authNotifier.deleteAccount(),
+                navigatorKey:
+                    GetIt.instance.get<BeamRouterDelegate>().navigatorKey!,
+              );
+            }
+          },
           iconPath: Assets.svg.profileDelete,
-          label: 'ui.deleteAccount'.tr(),
+          label: 'ui.deleteMyAccount'.tr(),
         ),
       ],
     );

diff --git a/learning/tour-of-beam/frontend/lib/constants/sizes.dart b/learning/tour-of-beam/frontend/lib/constants/sizes.dart
@@ -19,7 +19,6 @@
 class TobSizes {
   static const double footerHeight = 35;
   static const double authOverlayWidth = 260;
-  static const double hintPopupWidth = 420;
 }
 
 class ScreenSizes {

diff --git a/learning/tour-of-beam/frontend/lib/locator.dart b/learning/tour-of-beam/frontend/lib/locator.dart
@@ -18,6 +18,7 @@
 
 import 'package:app_state/app_state.dart';
 import 'package:get_it/get_it.dart';
+import 'package:playground_components/playground_components.dart';
 
 import 'auth/notifier.dart';
 import 'cache/content_tree.dart';
@@ -31,33 +32,33 @@ import 'router/page_factory.dart';
 import 'router/route_information_parser.dart';
 import 'state.dart';
 
+final _client = CloudFunctionsTobClient();
+
 Future<void> initializeServiceLocator() async {
   _initializeAuth();
   _initializeState();
   _initializeCaches();
 }
 
 void _initializeAuth() {
-  GetIt.instance.registerSingleton(AuthNotifier());
+  GetIt.instance.registerSingleton(AuthNotifier(client: _client));
 }
 
 void _initializeCaches() {
-  final client = CloudFunctionsTobClient();
-
-  GetIt.instance.registerSingleton<TobClient>(client);
-  GetIt.instance.registerSingleton(ContentTreeCache(client: client));
-  GetIt.instance.registerSingleton(SdkCache(client: client));
-  GetIt.instance.registerSingleton(UnitContentCache(client: client));
-  GetIt.instance.registerSingleton(UnitProgressCache(client: client));
+  GetIt.instance.registerSingleton<TobClient>(_client);
+  GetIt.instance.registerSingleton(ContentTreeCache(client: _client));
+  GetIt.instance.registerSingleton(SdkCache(client: _client));
+  GetIt.instance.registerSingleton(UnitContentCache(client: _client));
+  GetIt.instance.registerSingleton(UnitProgressCache(client: _client));
 }
 
 void _initializeState() {
-  GetIt.instance.registerSingleton(AppNotifier());
-  GetIt.instance.registerSingleton(
-    PageStack(
-      bottomPage: WelcomePage(),
-      createPage: PageFactory.createPage,
-      routeInformationParser: TobRouteInformationParser(),
-    ),
+  final pageStack = PageStack(
+    bottomPage: WelcomePage(),
+    createPage: PageFactory.createPage,
+    routeInformationParser: TobRouteInformationParser(),
   );
+  GetIt.instance.registerSingleton(AppNotifier());
+  GetIt.instance.registerSingleton(pageStack);
+  GetIt.instance.registerSingleton(BeamRouterDelegate(pageStack));
 }
diff --git a/learning/tour-of-beam/frontend/lib/main.dart b/learning/tour-of-beam/frontend/lib/main.dart
@@ -42,7 +42,7 @@ void main() async {
   const englishLocale = Locale('en');
 
   final pageStack = GetIt.instance.get<PageStack>();
-  final routerDelegate = PageStackRouterDelegate(pageStack);
+  final routerDelegate = GetIt.instance.get<BeamRouterDelegate>();
   final routeInformationParser = TobRouteInformationParser();
   final backButtonDispatcher = PageStackBackButtonDispatcher(pageStack);
 

diff --git a/learning/tour-of-beam/frontend/lib/pages/tour/state.dart b/learning/tour-of-beam/frontend/lib/pages/tour/state.dart
@@ -214,11 +214,11 @@ class TourNotifier extends ChangeNotifier with PageStateMixin<void> {
   }
 
   @override
-  void dispose() {
+  Future<void> dispose() async {
     _unitContentCache.removeListener(_onUnitChanged);
     contentTreeController.removeListener(_onUnitChanged);
     _appNotifier.removeListener(_onAppNotifierChanged);
     _authNotifier.removeListener(_onUnitProgressChanged);
-    super.dispose();
+    await super.dispose();
   }
 }
diff --git a/learning/tour-of-beam/frontend/lib/pages/tour/widgets/hints.dart b/learning/tour-of-beam/frontend/lib/pages/tour/widgets/hints.dart
@@ -22,7 +22,6 @@ import 'package:flutter_svg/svg.dart';
 import 'package:playground_components/playground_components.dart';
 
 import '../../../assets/assets.gen.dart';
-import '../../../constants/sizes.dart';
 import 'markdown/tob_markdown.dart';
 
 class HintsWidget extends StatelessWidget {
@@ -47,7 +46,7 @@ class HintsWidget extends StatelessWidget {
         }
       },
       icon: SvgPicture.asset(Assets.svg.hint),
-      label: const Text('ui.hint').tr(),
+      label: const Text('pages.tour.hint').tr(),
     );
   }
 }
@@ -63,14 +62,14 @@ class _Popup extends StatelessWidget {
   Widget build(BuildContext context) {
     return OverlayBody(
       child: Container(
-        width: TobSizes.hintPopupWidth,
+        width: BeamSizes.popupWidth,
         padding: const EdgeInsets.all(BeamSizes.size16),
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           mainAxisSize: MainAxisSize.min,
           children: [
             Text(
-              'ui.hint',
+              'pages.tour.hint',
               style: Theme.of(context).textTheme.headlineLarge,
             ).tr(),
             const SizedBox(height: BeamSizes.size8),

diff --git a/learning/tour-of-beam/frontend/lib/pages/tour/widgets/solution_button.dart b/learning/tour-of-beam/frontend/lib/pages/tour/widgets/solution_button.dart
@@ -19,6 +19,7 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
+import 'package:playground_components/playground_components.dart';
 
 import '../../../assets/assets.gen.dart';
 import '../state.dart';
@@ -42,9 +43,24 @@ class SolutionButton extends StatelessWidget {
                 : null,
           ),
         ),
-        onPressed: tourNotifier.toggleShowingSolution,
+        onPressed: () async {
+          // TODO(nausharipov): resolve the conflict with save user code
+          if (tourNotifier.isShowingSolution) {
+            tourNotifier.toggleShowingSolution();
+          } else {
+            final confirmed = await ConfirmDialog.show(
+              context: context,
+              confirmButtonText: 'pages.tour.showSolution'.tr(),
+              subtitle: 'pages.tour.solveYourself'.tr(),
+              title: 'pages.tour.solution'.tr(),
+            );
+            if (confirmed) {
+              tourNotifier.toggleShowingSolution();
+            }
+          }
+        },
         icon: SvgPicture.asset(Assets.svg.solution),
-        label: const Text('ui.solution').tr(),
+        label: const Text('pages.tour.solution').tr(),
       ),
     );
   }

diff --git a/learning/tour-of-beam/frontend/lib/repositories/client/client.dart b/learning/tour-of-beam/frontend/lib/repositories/client/client.dart
@@ -31,4 +31,6 @@ abstract class TobClient {
   Future<GetUserProgressResponse?> getUserProgress(String sdkId);
 
   Future<void> postUnitComplete(String sdkId, String id);
+
+  Future<void> postDeleteUserProgress();
 }
diff --git a/learning/tour-of-beam/frontend/lib/repositories/client/cloud_functions_client.dart b/learning/tour-of-beam/frontend/lib/repositories/client/cloud_functions_client.dart
@@ -101,4 +101,17 @@ class CloudFunctionsTobClient extends TobClient {
       },
     );
   }
+
+  @override
+  Future<void> postDeleteUserProgress() async {
+    final token = await GetIt.instance.get<AuthNotifier>().getToken();
+    await http.post(
+      Uri.parse(
+        '$cloudFunctionsBaseUrl/postDeleteProgress',
+      ),
+      headers: {
+        HttpHeaders.authorizationHeader: 'Bearer $token',
+      },
+    );
+  }
 }