vusakhoza/velocity-pay-flutter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added navigation and selection of workspaces

Browse Source
This commit is contained in:
Vusa
2026-06-23 00:22:30 +02:00
parent ae2705363a
commit e89c711d00
11 changed files with 118 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/routes.dart
View File

@@ -161,7 +161,10 @@ GoRouter buildRouter() {
return ScaffoldWithNavBar(child: child);
},
routes: [
GoRoute(path: '/workspace', builder: (context, state) => const WorkspaceScreen()),
GoRoute(
path: '/workspace',
builder: (context, state) => const WorkspaceScreen(),
),
GoRoute(path: '/', builder: (context, state) => const HomeScreen()),
GoRoute(
path: '/home',
@@ -249,11 +252,10 @@ GoRouter buildRouter() {
},
),
GoRoute(
path: '/groups/:groupId/batches/:batchId',
path: '/groups/batches/:batchId',
builder: (context, state) {
final batchId = state.pathParameters['batchId']!;
final groupId = state.pathParameters['groupId']!;
return BatchDetailScreen(batchId: batchId, groupId: groupId);
return BatchDetailScreen(batchId: batchId);
},
),
GoRoute(

2
lib/screens/groups/screens/batch_create_screen.dart
View File

@@ -122,7 +122,7 @@ class _BatchCreateScreenState extends State<BatchCreateScreen> {
}
if (!mounted) return;
context.pushReplacement('/groups/${widget.group.id}/batches/${batch.id}');
context.pushReplacement('/groups/batches/${batch.id}');
} else {
AppSnackBar.showError(context, result.error ?? 'Failed to create batch.');
}

2
lib/screens/groups/screens/batch_detail_screen.dart
View File

@@ -15,12 +15,10 @@ import 'package:url_launcher/url_launcher.dart';
class BatchDetailScreen extends StatefulWidget {
final String batchId;
final String groupId;
const BatchDetailScreen({
super.key,
required this.batchId,
required this.groupId,
});
@override

2
lib/screens/groups/screens/group_detail_screen.dart
View File

@@ -1142,7 +1142,7 @@ class _GroupDetailScreenState extends State<GroupDetailScreen>
borderRadius: BorderRadius.circular(12),
onTap: inSelectMode
? () => batchController.toggleBatchSelection(batch.id!)
: () => context.push('/groups/${group.id}/batches/${batch.id}'),
: () => context.push('/groups/batches/${batch.id}'),
child: Padding(
padding: const EdgeInsets.all(10),
child: Row(

18
lib/screens/history/history_controller.dart
View File

@@ -108,11 +108,11 @@ class HistoryController extends ChangeNotifier {
Future<void> searchTransactions(
String workspaceId, {
String? search,
String? billName,
String? status,
String? type,
}) async {
model.searchQuery = search ?? '';
model.searchQuery = billName ?? '';
model.statusFilter = status;
model.typeFilter = type;
final params = <String, String>{
@@ -121,13 +121,8 @@ class HistoryController extends ChangeNotifier {
'size': '20',
'sort': 'createdAt,desc',
};
if (search != null && search.isNotEmpty) {
params['creditAccount'] = search;
params['creditEmail'] = search;
params['creditPhone'] = search;
params['creditName'] = search;
params['billName'] = search;
params['amount'] = search;
if (billName != null && billName.isNotEmpty) {
params['billName'] = billName;
}
if (status != null && status.isNotEmpty) {
params['status'] = status;
@@ -149,12 +144,7 @@ class HistoryController extends ChangeNotifier {
'sort': 'createdAt,desc',
};
if (model.searchQuery.isNotEmpty) {
params['creditAccount'] = model.searchQuery;
params['creditEmail'] = model.searchQuery;
params['creditPhone'] = model.searchQuery;
params['creditName'] = model.searchQuery;
params['billName'] = model.searchQuery;
params['amount'] = model.searchQuery;
}
if (model.statusFilter != null && model.statusFilter!.isNotEmpty) {
params['status'] = model.statusFilter!;

8
lib/screens/history/history_screen.dart
View File

@@ -231,7 +231,7 @@ class _HistoryScreenState extends State<HistoryScreen>
prefs.getString("workspaceId") ?? '';
controller.searchTransactions(
workspaceId,
search: _searchController.text.isNotEmpty
billName: _searchController.text.isNotEmpty
? _searchController.text
: null,
status: controller.model.statusFilter,
@@ -356,7 +356,7 @@ class _HistoryScreenState extends State<HistoryScreen>
final workspaceId = prefs.getString("workspaceId") ?? '';
controller.searchTransactions(
workspaceId,
search: value.isNotEmpty ? value : null,
billName: value.isNotEmpty ? value : null,
status: controller.model.statusFilter,
type: controller.model.typeFilter,
);
@@ -501,7 +501,7 @@ class _HistoryScreenState extends State<HistoryScreen>
final workspaceId = prefs.getString("workspaceId") ?? '';
controller.searchTransactions(
workspaceId,
search: _searchController.text.isNotEmpty
billName: _searchController.text.isNotEmpty
? _searchController.text
: null,
type: controller.model.typeFilter,
@@ -514,7 +514,7 @@ class _HistoryScreenState extends State<HistoryScreen>
final workspaceId = prefs.getString("workspaceId") ?? '';
controller.searchTransactions(
workspaceId,
search: _searchController.text.isNotEmpty
billName: _searchController.text.isNotEmpty
? _searchController.text
: null,
status: controller.model.statusFilter,

24
lib/screens/home/home_screen.dart
View File

@@ -123,7 +123,7 @@ class _HomeScreenState extends State<HomeScreen> with TickerProviderStateMixin {
if (prefs.getString("token") != null) {
setState(() {
_isLoggedIn = true;
initials = prefs.getString("initials")!;
initials = prefs.getString("workspaceInitials")!;
});
}
@@ -347,24 +347,28 @@ class _HomeScreenState extends State<HomeScreen> with TickerProviderStateMixin {
end: Alignment.bottomLeft,
),
),
child: Center(
child: Text(
initials,
style: TextStyle(
fontSize: 12,
fontWeight: FontWeight.bold,
color: isDark ? Colors.white : Colors.black87,
child: InkWell(
child: Center(
child: Text(
initials,
style: TextStyle(
fontSize: 12,
fontWeight: FontWeight.bold,
color: isDark ? Colors.white : Colors.black87,
),
),
),
onTap: () => context.go('/workspace'),
),
),
SizedBox(width: 5),
IconButton(
icon: Icon(
Icons.logout_rounded,
Icons.logout,
color: isDark ? Colors.white54 : Colors.black54,
size: 20,
),
onPressed: _showLogoutDialog,
onPressed: () => _showLogoutDialog(),
),
],
];

11
lib/screens/receipt/receipt_screen.dart
View File

@@ -533,6 +533,15 @@ class _ReceiptScreenState extends State<ReceiptScreen>
isLoading: false,
onPressed: _captureImage,
),
if (_transaction?.batchId != null)
_modernActionButton(
icon: Icons.batch_prediction_rounded,
label: "View Batch",
color: const Color.fromARGB(255, 60, 99, 10),
isLoading: false,
onPressed: () =>
context.push('/groups/batches/${_transaction?.batchId}'),
),
if (integrationStatus != "SUCCESS" && paymentStatus == "SUCCESS") ...[
_modernActionButton(
icon: Icons.refresh_rounded,
@@ -1111,4 +1120,4 @@ class _DetailItem {
this.isWarning = false,
this.trailing,
});
}
}

4
lib/screens/transactions/transaction_model.dart
View File

@@ -51,6 +51,8 @@ class TransactionModel {
final String? id;
final DateTime? createdAt;
final String userId;
final String workspaceId;
final String? batchId;
final String trace;
final Decimal amount;
final Decimal charge;
@@ -99,6 +101,8 @@ class TransactionModel {
this.id,
this.createdAt,
required this.userId,
required this.workspaceId,
this.batchId,
required this.trace,
required this.amount,
required this.charge,

4
lib/screens/transactions/transaction_model.g.dart
View File

@@ -14,6 +14,8 @@ TransactionModel _$TransactionModelFromJson(Map<String, dynamic> json) =>
const DateTimeJsonConverter().fromJson,
),
userId: json['userId'] as String,
workspaceId: json['workspaceId'] as String,
batchId: json['batchId'] as String?,
trace: json['trace'] as String,
amount: const DecimalJsonConverter().fromJson(json['amount'] as num),
charge: const DecimalJsonConverter().fromJson(json['charge'] as num),
@@ -74,6 +76,8 @@ Map<String, dynamic> _$TransactionModelToJson(
const DateTimeJsonConverter().toJson,
),
'userId': instance.userId,
'workspaceId': instance.workspaceId,
'batchId': instance.batchId,
'trace': instance.trace,
'amount': const DecimalJsonConverter().toJson(instance.amount),
'charge': const DecimalJsonConverter().toJson(instance.charge),

140
lib/screens/workspaces/workspace_screen.dart
View File

@@ -1,6 +1,8 @@
import 'package:flutter/foundation.dart' show kIsWeb;
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
import 'package:provider/provider.dart';
import 'package:qpay/screens/workspaces/workspace_model.dart';
import 'package:qpay/screens/workspaces/workspace_provider.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:uuid/uuid.dart';
@@ -27,7 +29,6 @@ class _WorkspaceScreenState extends State<WorkspaceScreen>
late Animation<Offset> _slideAnimation;
AuthState authState = AuthState();
bool _navigated = false;
@override
void initState() {
@@ -86,8 +87,6 @@ class _WorkspaceScreenState extends State<WorkspaceScreen>
}
void _evaluateNavigation(WorkspaceProvider provider) {
if (_navigated) return;
final workspaces = provider.workspaces;
if (workspaces.length == 1) {
@@ -104,20 +103,16 @@ class _WorkspaceScreenState extends State<WorkspaceScreen>
// 2+ workspaces: stay on this screen so the user can pick one.
}
void _onWorkspaceSelected(String workspaceId) async {
if (_navigated) return;
_navigated = true;
void _onWorkspaceSelected(WorkspaceModel ws) async {
final prefs = await SharedPreferences.getInstance();
await prefs.setString('workspaceId', workspaceId);
await prefs.setString('workspaceId', ws.id);
await prefs.setString('workspaceInitials', ws.name[0]);
if (!mounted) return;
_navigateToHome();
}
void _navigateToHome() {
if (_navigated) return;
_navigated = true;
context.go('/');
}
@@ -149,68 +144,73 @@ class _WorkspaceScreenState extends State<WorkspaceScreen>
final workspaces = provider.workspaces;
return SafeArea(
child: FadeTransition(
opacity: _fadeAnimation,
child: SlideTransition(
position: _slideAnimation,
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 24),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const Spacer(flex: 2),
// Header
Container(
width: 56,
height: 56,
decoration: BoxDecoration(
color: theme.colorScheme.primary.withValues(
alpha: 0.1,
child: Center(
child: FadeTransition(
opacity: _fadeAnimation,
child: SlideTransition(
position: _slideAnimation,
child: SizedBox(
width: kIsWeb ? 600 : double.infinity,
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 24),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const SizedBox(height: 48),
// Header
Container(
width: 56,
height: 56,
decoration: BoxDecoration(
color: theme.colorScheme.primary.withValues(
alpha: 0.1,
),
borderRadius: BorderRadius.circular(16),
),
child: Icon(
Icons.business_rounded,
color: theme.colorScheme.primary,
size: 28,
),
),
borderRadius: BorderRadius.circular(16),
),
child: Icon(
Icons.business_rounded,
color: theme.colorScheme.primary,
size: 28,
),
const SizedBox(height: 24),
Text(
'Select a workspace',
style: theme.textTheme.headlineSmall?.copyWith(
fontWeight: FontWeight.w700,
color: Colors.black87,
),
),
const SizedBox(height: 8),
Text(
'Choose the workspace you want to work in.',
style: theme.textTheme.bodyMedium?.copyWith(
color: Colors.grey.shade600,
),
),
const SizedBox(height: 32),
// Workspace list
Expanded(
child: ListView.separated(
itemCount: workspaces.length,
separatorBuilder: (_, __) =>
const SizedBox(height: 12),
itemBuilder: (context, index) {
final ws = workspaces[index];
return _WorkspaceCard(
name: ws.name,
description: ws.description,
email: ws.email,
phone: ws.phone,
onTap: () => _onWorkspaceSelected(ws),
);
},
),
),
const SizedBox(height: 24),
],
),
const SizedBox(height: 24),
Text(
'Select a workspace',
style: theme.textTheme.headlineSmall?.copyWith(
fontWeight: FontWeight.w700,
color: Colors.black87,
),
),
const SizedBox(height: 8),
Text(
'Choose the workspace you want to work in.',
style: theme.textTheme.bodyMedium?.copyWith(
color: Colors.grey.shade600,
),
),
const SizedBox(height: 32),
// Workspace list
Expanded(
child: ListView.separated(
itemCount: workspaces.length,
separatorBuilder: (_, __) =>
const SizedBox(height: 12),
itemBuilder: (context, index) {
final ws = workspaces[index];
return _WorkspaceCard(
name: ws.name,
description: ws.description,
email: ws.email,
phone: ws.phone,
onTap: () => _onWorkspaceSelected(ws.id),
);
},
),
),
const Spacer(flex: 1),
],
),
),
),
),