conflicts resolution

This commit is contained in:
Stephan D
2025-11-26 15:00:21 +01:00
53 changed files with 620 additions and 296 deletions

View File

@@ -8,8 +8,9 @@ import 'package:provider/provider.dart';
import 'package:logging/logging.dart';
import 'package:pshared/config/constants.dart';
import 'package:pshared/provider/account.dart';
import 'package:pshared/provider/locale.dart';
import 'package:pshared/provider/permissions.dart';
import 'package:pshared/provider/account.dart';
import 'package:pshared/provider/organizations.dart';
import 'package:pweb/app/app.dart';
@@ -63,6 +64,11 @@ void main() async {
create: (_) => TwoFactorProvider(),
update: (context, accountProvider, provider) => provider!..update(accountProvider),
),
ChangeNotifierProxyProvider<OrganizationsProvider, PermissionsProvider>(
create: (_) => PermissionsProvider(),
update: (context, orgnization, provider) => provider!..update(orgnization),
),
ChangeNotifierProvider(create: (_) => TwoFactorProvider()),
ChangeNotifierProvider(create: (_) => OrganizationsProvider()),
ChangeNotifierProvider(create: (_) => CarouselIndexProvider()),