Merge pull request #27 from headlines-toolkit/refatcor_sync_teh_dashboard_logic_and_ui_with_updated_models

Refatcor sync teh dashboard logic and UI with updated models

Author: fulleni

lib/app/bloc/app_bloc.dart

@@ -8,6 +8,7 @@ import 'package:ht_auth_repository/ht_auth_repository.dart';
 import 'package:ht_dashboard/app/config/config.dart' as local_config;
 import 'package:ht_data_repository/ht_data_repository.dart';
 import 'package:ht_shared/ht_shared.dart';
+import 'package:logging/logging.dart';
 
 part 'app_event.dart';
 part 'app_state.dart';
@@ -16,11 +17,13 @@ class AppBloc extends Bloc<AppEvent, AppState> {
   AppBloc({
     required HtAuthRepository authenticationRepository,
     required HtDataRepository<UserAppSettings> userAppSettingsRepository,
-    required HtDataRepository<AppConfig> appConfigRepository,
+    required HtDataRepository<RemoteConfig> appConfigRepository,
     required local_config.AppEnvironment environment,
+    Logger? logger,
   }) : _authenticationRepository = authenticationRepository,
        _userAppSettingsRepository = userAppSettingsRepository,
        _appConfigRepository = appConfigRepository,
+       _logger = logger ?? Logger('AppBloc'),
        super(
          AppState(environment: environment),
        ) {
@@ -35,7 +38,8 @@ class AppBloc extends Bloc<AppEvent, AppState> {
 
   final HtAuthRepository _authenticationRepository;
   final HtDataRepository<UserAppSettings> _userAppSettingsRepository;
-  final HtDataRepository<AppConfig> _appConfigRepository;
+  final HtDataRepository<RemoteConfig> _appConfigRepository;
+  final Logger _logger;
   late final StreamSubscription<User?> _userSubscription;
 
   /// Handles user changes and loads initial settings once user is available.
@@ -46,10 +50,15 @@ class AppBloc extends Bloc<AppEvent, AppState> {
     final user = event.user;
     final AppStatus status;
 
-    if (user != null &&
-        (user.roles.contains(UserRoles.admin) ||
-            user.roles.contains(UserRoles.publisher))) {
-      status = AppStatus.authenticated;
+    if (user != null) {
+      if (user.dashboardRole == DashboardUserRole.admin ||
+          user.dashboardRole == DashboardUserRole.publisher) {
+        status = AppStatus.authenticated;
+      } else if (user.appRole == AppUserRole.guestUser) {
+        status = AppStatus.anonymous;
+      } else {
+        status = AppStatus.unauthenticated;
+      }
     } else {
       status = AppStatus.unauthenticated;
     }
@@ -66,20 +75,47 @@ class AppBloc extends Bloc<AppEvent, AppState> {
         emit(state.copyWith(userAppSettings: userAppSettings));
       } on NotFoundException {
         // If settings not found, create default ones
-        final defaultSettings = UserAppSettings(id: user.id);
+        _logger.info(
+          'User app settings not found for user ${user.id}. Creating default.',
+        );
+        final defaultSettings = UserAppSettings(
+          id: user.id, // Use actual user ID for default settings
+          displaySettings: const DisplaySettings(
+            baseTheme: AppBaseTheme.system,
+            accentTheme: AppAccentTheme.defaultBlue,
+            fontFamily: 'SystemDefault',
+            textScaleFactor: AppTextScaleFactor.medium,
+            fontWeight: AppFontWeight.regular,
+          ),
+          language: 'en',
+          feedPreferences: const FeedDisplayPreferences(
+            headlineDensity: HeadlineDensity.standard,
+            headlineImageStyle: HeadlineImageStyle.largeThumbnail,
+            showSourceInHeadlineFeed: true,
+            showPublishDateInHeadlineFeed: true,
+          ),
+        );
         await _userAppSettingsRepository.create(item: defaultSettings);
         emit(state.copyWith(userAppSettings: defaultSettings));
-      } on HtHttpException catch (e) {
+      } on HtHttpException catch (e, s) {
         // Handle HTTP exceptions during settings load
-        print('Error loading user app settings: ${e.message}');
+        _logger.severe(
+          'Error loading user app settings for user ${user.id}: ${e.message}',
+          e,
+          s,
+        );
         emit(state.copyWith(clearUserAppSettings: true));
-      } catch (e) {
+      } catch (e, s) {
         // Handle any other unexpected errors
-        print('Unexpected error loading user app settings: $e');
+        _logger.severe(
+          'Unexpected error loading user app settings for user ${user.id}: $e',
+          e,
+          s,
+        );
         emit(state.copyWith(clearUserAppSettings: true));
       }
     } else {
-      // If user is unauthenticated, clear app settings
+      // If user is unauthenticated or anonymous, clear app settings
       emit(state.copyWith(clearUserAppSettings: true));
     }
   }

lib/app/bloc/app_state.dart

@@ -15,6 +15,10 @@ enum AppStatus {
   anonymous,
 }
 
+/// {@template app_state}
+/// Represents the overall state of the application, including authentication
+/// status, current user, environment, and user-specific settings.
+/// {@endtemplate}
 class AppState extends Equatable {
   /// {@macro app_state}
   const AppState({

lib/app/view/app.dart

@@ -18,44 +18,43 @@ import 'package:ht_dashboard/router/router.dart';
 import 'package:ht_dashboard/shared/theme/app_theme.dart';
 import 'package:ht_data_repository/ht_data_repository.dart';
 import 'package:ht_kv_storage_service/ht_kv_storage_service.dart';
-import 'package:ht_shared/ht_shared.dart';
+import 'package:ht_shared/ht_shared.dart' hide AppStatus;
+import 'package:logging/logging.dart';
 
 class App extends StatelessWidget {
   const App({
     required HtAuthRepository htAuthenticationRepository,
     required HtDataRepository<Headline> htHeadlinesRepository,
-    required HtDataRepository<Category> htCategoriesRepository,
+    required HtDataRepository<Topic> htTopicsRepository,
     required HtDataRepository<Country> htCountriesRepository,
     required HtDataRepository<Source> htSourcesRepository,
     required HtDataRepository<UserAppSettings> htUserAppSettingsRepository,
-    required HtDataRepository<UserContentPreferences>
-    htUserContentPreferencesRepository,
-    required HtDataRepository<AppConfig> htAppConfigRepository,
+    required HtDataRepository<UserContentPreferences> htUserContentPreferencesRepository,
+    required HtDataRepository<RemoteConfig> htRemoteConfigRepository,
     required HtDataRepository<DashboardSummary> htDashboardSummaryRepository,
     required HtKVStorageService kvStorageService,
     required AppEnvironment environment,
     super.key,
   }) : _htAuthenticationRepository = htAuthenticationRepository,
        _htHeadlinesRepository = htHeadlinesRepository,
-       _htCategoriesRepository = htCategoriesRepository,
+       _htTopicsRepository = htTopicsRepository,
        _htCountriesRepository = htCountriesRepository,
        _htSourcesRepository = htSourcesRepository,
        _htUserAppSettingsRepository = htUserAppSettingsRepository,
        _htUserContentPreferencesRepository = htUserContentPreferencesRepository,
-       _htAppConfigRepository = htAppConfigRepository,
+       _htRemoteConfigRepository = htRemoteConfigRepository,
        _kvStorageService = kvStorageService,
        _htDashboardSummaryRepository = htDashboardSummaryRepository,
        _environment = environment;
 
   final HtAuthRepository _htAuthenticationRepository;
   final HtDataRepository<Headline> _htHeadlinesRepository;
-  final HtDataRepository<Category> _htCategoriesRepository;
+  final HtDataRepository<Topic> _htTopicsRepository;
   final HtDataRepository<Country> _htCountriesRepository;
   final HtDataRepository<Source> _htSourcesRepository;
   final HtDataRepository<UserAppSettings> _htUserAppSettingsRepository;
-  final HtDataRepository<UserContentPreferences>
-  _htUserContentPreferencesRepository;
-  final HtDataRepository<AppConfig> _htAppConfigRepository;
+  final HtDataRepository<UserContentPreferences> _htUserContentPreferencesRepository;
+  final HtDataRepository<RemoteConfig> _htRemoteConfigRepository;
   final HtDataRepository<DashboardSummary> _htDashboardSummaryRepository;
   final HtKVStorageService _kvStorageService;
   final AppEnvironment _environment;
@@ -66,12 +65,12 @@ class App extends StatelessWidget {
       providers: [
         RepositoryProvider.value(value: _htAuthenticationRepository),
         RepositoryProvider.value(value: _htHeadlinesRepository),
-        RepositoryProvider.value(value: _htCategoriesRepository),
+        RepositoryProvider.value(value: _htTopicsRepository),
         RepositoryProvider.value(value: _htCountriesRepository),
         RepositoryProvider.value(value: _htSourcesRepository),
         RepositoryProvider.value(value: _htUserAppSettingsRepository),
         RepositoryProvider.value(value: _htUserContentPreferencesRepository),
-        RepositoryProvider.value(value: _htAppConfigRepository),
+        RepositoryProvider.value(value: _htRemoteConfigRepository),
         RepositoryProvider.value(value: _htDashboardSummaryRepository),
         RepositoryProvider.value(value: _kvStorageService),
       ],
@@ -80,10 +79,12 @@ class App extends StatelessWidget {
           BlocProvider(
             create: (context) => AppBloc(
               authenticationRepository: context.read<HtAuthRepository>(),
-              userAppSettingsRepository: context
-                  .read<HtDataRepository<UserAppSettings>>(),
-              appConfigRepository: context.read<HtDataRepository<AppConfig>>(),
+              userAppSettingsRepository:
+                  context.read<HtDataRepository<UserAppSettings>>(),
+              appConfigRepository:
+                  context.read<HtDataRepository<RemoteConfig>>(),
               environment: _environment,
+              logger: Logger('AppBloc'),
             ),
           ),
           BlocProvider(
@@ -93,21 +94,23 @@ class App extends StatelessWidget {
           ),
           BlocProvider(
             create: (context) => AppConfigurationBloc(
-              appConfigRepository: context.read<HtDataRepository<AppConfig>>(),
+              remoteConfigRepository:
+                  context.read<HtDataRepository<RemoteConfig>>(),
             ),
           ),
           BlocProvider(
             create: (context) => ContentManagementBloc(
               headlinesRepository: context.read<HtDataRepository<Headline>>(),
-              categoriesRepository: context.read<HtDataRepository<Category>>(),
+              topicsRepository: context.read<HtDataRepository<Topic>>(),
               sourcesRepository: context.read<HtDataRepository<Source>>(),
             ),
           ),
           BlocProvider(
             create: (context) => DashboardBloc(
-              dashboardSummaryRepository: context
-                  .read<HtDataRepository<DashboardSummary>>(),
-              appConfigRepository: context.read<HtDataRepository<AppConfig>>(),
+              dashboardSummaryRepository:
+                  context.read<HtDataRepository<DashboardSummary>>(),
+              appConfigRepository:
+                  context.read<HtDataRepository<RemoteConfig>>(),
               headlinesRepository: context.read<HtDataRepository<Headline>>(),
             ),
           ),
@@ -122,6 +125,7 @@ class App extends StatelessWidget {
 }
 
 class _AppView extends StatefulWidget {
+  /// {@macro app_view}
   const _AppView({
     required this.htAuthenticationRepository,
     required this.environment,
@@ -215,7 +219,7 @@ class _AppViewState extends State<_AppView> {
                   themeMode: switch (baseTheme) {
                     AppBaseTheme.light => ThemeMode.light,
                     AppBaseTheme.dark => ThemeMode.dark,
-                    AppBaseTheme.system || null => ThemeMode.system,
+                    _ => ThemeMode.system,
                   },
                   locale: language != null ? Locale(language) : null,
                 ),

lib/app/view/app_shell.dart

@@ -22,13 +22,6 @@ class AppShell extends StatelessWidget {
   /// navigators in a stateful way.
   final StatefulNavigationShell navigationShell;
 
-  void _goBranch(int index) {
-    navigationShell.goBranch(
-      index,
-      initialLocation: index == navigationShell.currentIndex,
-    );
-  }
-
   @override
   Widget build(BuildContext context) {
     final l10n = context.l10n;
@@ -70,7 +63,12 @@ class AppShell extends StatelessWidget {
       ),
       body: AdaptiveScaffold(
         selectedIndex: navigationShell.currentIndex,
-        onSelectedIndexChange: _goBranch,
+        onSelectedIndexChange: (index) {
+          navigationShell.goBranch(
+            index,
+            initialLocation: index == navigationShell.currentIndex,
+          );
+        },
         destinations: [
           NavigationDestination(
             icon: const Icon(Icons.dashboard_outlined),

lib/app_configuration/bloc/app_configuration_bloc.dart

@@ -1,16 +1,16 @@
 import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
 import 'package:ht_data_repository/ht_data_repository.dart';
-import 'package:ht_shared/ht_shared.dart'; // Use AppConfig from ht_shared
+import 'package:ht_shared/ht_shared.dart'; // Use RemoteConfig from ht_shared
 
 part 'app_configuration_event.dart';
 part 'app_configuration_state.dart';
 
 class AppConfigurationBloc
     extends Bloc<AppConfigurationEvent, AppConfigurationState> {
   AppConfigurationBloc({
-    required HtDataRepository<AppConfig> appConfigRepository,
-  }) : _appConfigRepository = appConfigRepository,
+    required HtDataRepository<RemoteConfig> remoteConfigRepository,
+  }) : _remoteConfigRepository = remoteConfigRepository,
        super(
          const AppConfigurationState(),
        ) {
@@ -20,20 +20,20 @@ class AppConfigurationBloc
     on<AppConfigurationDiscarded>(_onAppConfigurationDiscarded);
   }
 
-  final HtDataRepository<AppConfig> _appConfigRepository;
+  final HtDataRepository<RemoteConfig> _remoteConfigRepository;
 
   Future<void> _onAppConfigurationLoaded(
     AppConfigurationLoaded event,
     Emitter<AppConfigurationState> emit,
   ) async {
     emit(state.copyWith(status: AppConfigurationStatus.loading));
     try {
-      final appConfig = await _appConfigRepository.read(id: 'app_config');
+      final remoteConfig = await _remoteConfigRepository.read(id: 'app_config');
       emit(
         state.copyWith(
           status: AppConfigurationStatus.success,
-          appConfig: appConfig,
-          originalAppConfig: appConfig, // Store the original config
+          remoteConfig: remoteConfig,
+          originalRemoteConfig: remoteConfig, // Store the original config
           isDirty: false,
           clearShowSaveSuccess:
               true, // Clear any previous success snackbar flag
@@ -62,15 +62,15 @@ class AppConfigurationBloc
   ) async {
     emit(state.copyWith(status: AppConfigurationStatus.loading));
     try {
-      final updatedConfig = await _appConfigRepository.update(
-        id: event.appConfig.id,
-        item: event.appConfig,
+      final updatedConfig = await _remoteConfigRepository.update(
+        id: event.remoteConfig.id,
+        item: event.remoteConfig,
       );
       emit(
         state.copyWith(
           status: AppConfigurationStatus.success,
-          appConfig: updatedConfig,
-          originalAppConfig: updatedConfig, // Update original config on save
+          remoteConfig: updatedConfig,
+          originalRemoteConfig: updatedConfig, // Update original config on save
           isDirty: false,
           showSaveSuccess: true, // Set flag to show success snackbar
         ),
@@ -98,7 +98,7 @@ class AppConfigurationBloc
   ) {
     emit(
       state.copyWith(
-        appConfig: event.appConfig,
+        remoteConfig: event.remoteConfig,
         isDirty: true,
         clearErrorMessage: true, // Clear any previous error messages
         clearShowSaveSuccess: true, // Clear success snackbar on field change
@@ -112,7 +112,7 @@ class AppConfigurationBloc
   ) {
     emit(
       state.copyWith(
-        appConfig: state.originalAppConfig, // Revert to original config
+        remoteConfig: state.originalRemoteConfig, // Revert to original config
         isDirty: false,
         clearErrorMessage: true, // Clear any previous error messages
         clearShowSaveSuccess: true, // Clear success snackbar

lib/app_configuration/bloc/app_configuration_event.dart

@@ -24,13 +24,13 @@ class AppConfigurationLoaded extends AppConfigurationEvent {
 /// {@endtemplate}
 class AppConfigurationUpdated extends AppConfigurationEvent {
   /// {@macro app_configuration_updated}
-  const AppConfigurationUpdated(this.appConfig);
+  const AppConfigurationUpdated(this.remoteConfig);
 
   /// The updated application configuration.
-  final AppConfig appConfig;
+  final RemoteConfig remoteConfig;
 
   @override
-  List<Object?> get props => [appConfig];
+  List<Object?> get props => [remoteConfig];
 }
 
 /// {@template app_configuration_discarded}
@@ -50,12 +50,12 @@ class AppConfigurationDiscarded extends AppConfigurationEvent {
 class AppConfigurationFieldChanged extends AppConfigurationEvent {
   /// {@macro app_configuration_field_changed}
   const AppConfigurationFieldChanged({
-    this.appConfig,
+    this.remoteConfig,
   });
 
-  /// The partially or fully updated AppConfig object.
-  final AppConfig? appConfig;
+  /// The partially or fully updated RemoteConfig object.
+  final RemoteConfig? remoteConfig;
 
   @override
-  List<Object?> get props => [appConfig];
+  List<Object?> get props => [remoteConfig];
 }