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

BIN
frontend/pshared/.DS_Store vendored Normal file

Binary file not shown.

View File

@@ -22,10 +22,6 @@ enum ResourceType {
@JsonValue('clients')
clients,
/// Represents comments on tasks or other resources
@JsonValue('comments')
comments,
/// Represents invitations sent to users
@JsonValue('invitations')
invitations,
@@ -46,6 +42,9 @@ enum ResourceType {
@JsonValue('organizations')
organizations,
@JsonValue('chain_wallets')
chainWallets,
/// Represents permissions service
@JsonValue('permissions')
permissions,
@@ -54,25 +53,6 @@ enum ResourceType {
@JsonValue('policies')
policies,
/// Represents task or project priorities
@JsonValue('priorities')
priorities,
/// Represents priority groups
@JsonValue('priority_groups')
priorityGroups,
/// Represents projects managed in the system
@JsonValue('projects')
projects,
@JsonValue('properties')
properties,
/// Represents reactions
@JsonValue('reactions')
reactions,
/// Represents refresh tokens for authentication
@JsonValue('refresh_tokens')
refreshTokens,
@@ -88,20 +68,4 @@ enum ResourceType {
/// Represents steps in workflows or processes
@JsonValue('steps')
steps,
/// Represents tasks managed in the system
@JsonValue('tasks')
tasks,
/// Represents teams managed in the system
@JsonValue('teams')
teams,
/// Represents workflows for tasks or projects
@JsonValue('workflows')
workflows,
/// Represents workspaces containing projects and teams
@JsonValue('workspaces')
workspaces;
}

View File

@@ -21,8 +21,8 @@ class ResourceContainer<T extends GenericProvider> extends StatelessWidget {
@override
Widget build(BuildContext context) => Consumer<T>(builder: (context, provider, _) {
if (provider.isLoading) return loading ?? Center(child: CircularProgressIndicator());
if (provider.error != null) return error ?? Text('Error while loading data. Try again'); //TODO: need to implement localizations and add more details to the error
if (provider.isEmpty) return empty ?? Text('Empty data'); //TODO: need to implement localizations too
if (provider.error != null) return error ?? Text('Error while loading data. Try again');
if (provider.isEmpty) return empty ?? Text('Empty data');
return builder(context, provider);
});
}