tech/sendico
2
0
Fork 0
Code Issues 23 Pull Requests 3 Actions Packages Projects Releases Wiki Activity

conflicts resolution

Browse Source
This commit is contained in:
Stephan D
2025-11-26 15:00:21 +01:00
parent 48ccbb1c82 357af99564
commit 44446c6ad4
53 changed files with 620 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
frontend/pweb/lib/pages/loaders/account.dart
View File

@@ -26,13 +26,10 @@ class AccountLoader extends StatelessWidget {
);
navigateAndReplace(context, Pages.login);
}
if ((provider.error == null) && (provider.account == null)) {
WidgetsBinding.instance.addPostFrameCallback((_) {
provider.restore();
});
if (provider.account == null) {
WidgetsBinding.instance.addPostFrameCallback((_) => navigateAndReplace(context, Pages.login));
return const Center(child: CircularProgressIndicator());
}
return child;
});
}

9
frontend/pweb/lib/pages/loaders/permissions.dart
View File

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pshared/provider/account.dart';
import 'package:pshared/provider/permissions.dart';
import 'package:pweb/app/router/pages.dart';
@@ -16,8 +17,10 @@ class PermissionsLoader extends StatelessWidget {
const PermissionsLoader({super.key, required this.child});
@override
Widget build(BuildContext context) => Consumer<PermissionsProvider>(builder: (context, provider, _) {
if (provider.isLoading) return const Center(child: CircularProgressIndicator());
Widget build(BuildContext context) => Consumer2<PermissionsProvider, AccountProvider>(builder: (context, provider, accountProvider, _) {
if (provider.isLoading) {
return const Center(child: CircularProgressIndicator());
}
if (provider.error != null) {
postNotifyUserOfErrorX(
context: context,
@@ -26,7 +29,7 @@ class PermissionsLoader extends StatelessWidget {
);
navigateAndReplace(context, Pages.login);
}
if ((provider.error == null) && (provider.permissions.isEmpty)) {
if (provider.error == null && !provider.isReady && accountProvider.account != null) {
WidgetsBinding.instance.addPostFrameCallback((_) {
provider.load();
});