Merge pull request #88 from pvdthings/rename-borrowers-members

rename "borrowers" to "members" where appropriate

apps/librarian/lib/dashboard/layouts/borrowers_desktop_layout.dart → apps/librarian/lib/dashboard/layouts/members_desktop_layout.dart

@@ -1,17 +1,17 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:librarian_app/modules/borrowers/providers/borrower_details_provider.dart';
-import 'package:librarian_app/modules/borrowers/providers/borrowers_filter_provider.dart';
-import 'package:librarian_app/modules/borrowers/providers/selected_borrower_provider.dart';
-import 'package:librarian_app/modules/borrowers/details/borrower_details_pane.dart';
+import 'package:librarian_app/modules/members/providers/borrower_details_provider.dart';
+import 'package:librarian_app/modules/members/providers/borrowers_filter_provider.dart';
+import 'package:librarian_app/modules/members/providers/selected_borrower_provider.dart';
+import 'package:librarian_app/modules/members/details/member_details_pane.dart';
 import 'package:librarian_app/widgets/fields/search_field.dart';
 import 'package:librarian_app/widgets/panes/list_pane.dart';
 import 'package:librarian_app/widgets/panes/pane_header.dart';
 
-import '../../modules/borrowers/list/borrowers_list_view.dart';
+import '../../modules/members/list/members_list_view.dart';
 
-class BorrowersDesktopLayout extends ConsumerWidget {
-  const BorrowersDesktopLayout({super.key});
+class MembersDesktopLayout extends ConsumerWidget {
+  const MembersDesktopLayout({super.key});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -30,10 +30,10 @@ class BorrowersDesktopLayout extends ConsumerWidget {
               },
             ),
           ),
-          child: const BorrowersListView(),
+          child: const MembersListView(),
         ),
         Expanded(
-          child: BorrowerDetailsPane(
+          child: MemberDetailsPane(
             borrowerFuture: ref.watch(borrowerDetailsProvider),
           ),
         ),

apps/librarian/lib/dashboard/pages/dashboard_page.dart

@@ -5,9 +5,9 @@ import 'package:librarian_app/dashboard/providers/create_loan_controller.dart';
 import 'package:librarian_app/dashboard/providers/workspace.dart';
 import 'package:librarian_app/modules/authentication/providers/auth_service_provider.dart';
 import 'package:librarian_app/modules/authentication/providers/user_tray.dart';
-import 'package:librarian_app/modules/borrowers/details/needs_attention_page.dart';
-import 'package:librarian_app/dashboard/layouts/borrowers_desktop_layout.dart';
-import 'package:librarian_app/modules/borrowers/list/searchable_borrowers_list.dart';
+import 'package:librarian_app/modules/members/details/needs_attention_page.dart';
+import 'package:librarian_app/dashboard/layouts/members_desktop_layout.dart';
+import 'package:librarian_app/modules/members/list/searchable_members_list.dart';
 import 'package:librarian_app/dashboard/providers/end_drawer_provider.dart';
 import 'package:librarian_app/dashboard/widgets/create_menu_item.dart';
 import 'package:librarian_app/dashboard/layouts/inventory_desktop_layout.dart';
@@ -74,12 +74,12 @@ class _DashboardPageState extends ConsumerState<DashboardPage> {
       ),
     ),
     DashboardModule(
-      title: 'Borrowers',
-      desktopLayout: const BorrowersDesktopLayout(),
-      mobileLayout: SearchableBorrowersList(
+      title: 'Members',
+      desktopLayout: const MembersDesktopLayout(),
+      mobileLayout: SearchableMembersList(
         onTapBorrower: (borrower) {
           Navigator.push(context, MaterialPageRoute(builder: (_) {
-            return NeedsAttentionPage(borrower: borrower);
+            return NeedsAttentionPage(member: borrower);
           }));
         },
       ),
@@ -219,7 +219,7 @@ class _DashboardPageState extends ConsumerState<DashboardPage> {
                     NavigationDestination(
                       selectedIcon: Icon(Icons.people),
                       icon: Icon(Icons.people_outlined),
-                      label: "Borrowers",
+                      label: "Members",
                     ),
                     NavigationDestination(
                       selectedIcon: Icon(Icons.build),

apps/librarian/lib/dashboard/widgets/desktop_dashboard.dart

@@ -33,7 +33,7 @@ class DesktopDashboard extends StatelessWidget {
               NavigationRailDestination(
                 selectedIcon: Icon(Icons.people),
                 icon: Icon(Icons.people_outlined),
-                label: Text('Borrowers'),
+                label: Text('Members'),
                 padding: EdgeInsets.symmetric(vertical: 8),
               ),
               NavigationRailDestination(

apps/librarian/lib/modules/loans/checkout/stepper/borrower/borrower_search_delegate.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 
 import '../../../../../core/api/models/borrower_model.dart';
-import '../../../../borrowers/list/borrowers_list.dart';
+import '../../../../members/list/members_list.dart';
 
 class BorrowerSearchDelegate extends SearchDelegate<BorrowerModel?> {
   BorrowerSearchDelegate(this.borrowers);

apps/librarian/lib/modules/loans/checkout/stepper/borrower/borrower_step.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:librarian_app/core/api/models/borrower_model.dart';
-import 'package:librarian_app/modules/borrowers/details/borrower_issues.dart';
-import 'package:librarian_app/modules/borrowers/providers/borrowers_repository_provider.dart';
+import 'package:librarian_app/modules/members/details/issues.dart';
+import 'package:librarian_app/modules/members/providers/borrowers_repository_provider.dart';
 import 'package:librarian_app/modules/loans/checkout/stepper/borrower/borrower_search_delegate.dart';
 
 Step buildBorrowerStep({
@@ -23,7 +23,7 @@ Step buildBorrowerStep({
         ),
         if (borrower != null && !borrower.active) ...[
           const SizedBox(height: 16),
-          BorrowerIssues(
+          MemberIssues(
             borrowerId: borrower.id,
             issues: borrower.issues,
             onRecordCashPayment: (success) {

apps/librarian/lib/modules/borrowers/details/borrower_issues.dart → apps/librarian/lib/modules/members/details/issues.dart

@@ -1,16 +1,16 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:librarian_app/modules/borrowers/providers/borrowers_repository_provider.dart';
+import 'package:librarian_app/modules/members/providers/borrowers_repository_provider.dart';
 
 import '../../../core/api/models/issue_model.dart';
 import '../payments/dues_dialog.dart';
 
-class BorrowerIssues extends ConsumerWidget {
+class MemberIssues extends ConsumerWidget {
   final String borrowerId;
   final List<Issue> issues;
   final void Function(bool success) onRecordCashPayment;
 
-  const BorrowerIssues({
+  const MemberIssues({
     super.key,
     required this.borrowerId,
     required this.issues,
@@ -26,7 +26,7 @@ class BorrowerIssues extends ConsumerWidget {
           duesNotPaidIssue,
           isOk: !issues.contains(duesNotPaidIssue),
           trailing: _PayDuesButton(
-            borrowerId: borrowerId,
+            memberId: borrowerId,
             onRecordCashPayment: onRecordCashPayment,
           ),
         ),
@@ -86,11 +86,11 @@ class _IssueTile extends StatelessWidget {
 
 class _PayDuesButton extends ConsumerWidget {
   const _PayDuesButton({
-    required this.borrowerId,
+    required this.memberId,
     required this.onRecordCashPayment,
   });
 
-  final String borrowerId;
+  final String memberId;
   final void Function(bool success) onRecordCashPayment;
 
   @override
@@ -107,7 +107,7 @@ class _PayDuesButton extends ConsumerWidget {
               onConfirmPayment: (cash) async {
                 final result = await ref
                     .read(borrowersRepositoryProvider.notifier)
-                    .recordPayment(borrowerId: borrowerId, cash: cash);
+                    .recordPayment(borrowerId: memberId, cash: cash);
 
                 onRecordCashPayment(result);
               },

apps/librarian/lib/modules/borrowers/details/issues_card.dart → apps/librarian/lib/modules/members/details/issues_card.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:librarian_app/core/api/models/issue_model.dart';
-import 'package:librarian_app/modules/borrowers/details/borrower_issues.dart';
+import 'package:librarian_app/modules/members/details/issues.dart';
 import 'package:librarian_app/widgets/details_card/card_header.dart';
 import 'package:librarian_app/widgets/details_card/details_card.dart';
 
@@ -19,7 +19,7 @@ class IssuesCard extends ConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     return DetailsCard(
       header: const CardHeader(title: 'Issues'),
-      body: BorrowerIssues(
+      body: MemberIssues(
         borrowerId: borrowerId,
         issues: issues,
         onRecordCashPayment: (success) {

apps/librarian/lib/modules/borrowers/details/borrower_details.dart → apps/librarian/lib/modules/members/details/member_details.dart

@@ -1,12 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:librarian_app/modules/borrowers/details/contact_card.dart';
-import 'package:librarian_app/modules/borrowers/providers/borrower_details_provider.dart';
-import 'package:librarian_app/modules/borrowers/details/issues_card.dart';
-import 'package:librarian_app/modules/borrowers/details/payments_card.dart';
+import 'package:librarian_app/modules/members/details/contact_card.dart';
+import 'package:librarian_app/modules/members/providers/borrower_details_provider.dart';
+import 'package:librarian_app/modules/members/details/issues_card.dart';
+import 'package:librarian_app/modules/members/details/payments_card.dart';
 
-class BorrowerDetails extends ConsumerWidget {
-  const BorrowerDetails({super.key});
+class MemberDetails extends ConsumerWidget {
+  const MemberDetails({super.key});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {

apps/librarian/lib/modules/borrowers/details/borrower_details_pane.dart → apps/librarian/lib/modules/members/details/member_details_pane.dart

@@ -1,16 +1,16 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:librarian_app/modules/borrowers/providers/edited_borrower_details_providers.dart';
-import 'package:librarian_app/modules/borrowers/details/borrower_details.dart';
+import 'package:librarian_app/modules/members/providers/edited_borrower_details_providers.dart';
+import 'package:librarian_app/modules/members/details/member_details.dart';
 import 'package:librarian_app/widgets/dialogs/save_dialog.dart';
 import 'package:librarian_app/widgets/panes/pane_header.dart';
 
 import '../../../core/api/models/borrower_model.dart';
 
-class BorrowerDetailsPane extends ConsumerWidget {
+class MemberDetailsPane extends ConsumerWidget {
   final Future<BorrowerModel?> borrowerFuture;
 
-  const BorrowerDetailsPane({
+  const MemberDetailsPane({
     super.key,
     required this.borrowerFuture,
   });
@@ -97,7 +97,7 @@ class BorrowerDetailsPane extends ConsumerWidget {
                       child: SingleChildScrollView(
                         child: Padding(
                           padding: EdgeInsets.all(16),
-                          child: BorrowerDetails(),
+                          child: MemberDetails(),
                         ),
                       ),
                     ),

apps/librarian/lib/modules/borrowers/details/needs_attention_page.dart → apps/librarian/lib/modules/members/details/needs_attention_page.dart

@@ -4,15 +4,15 @@ import 'package:librarian_app/core/api/models/borrower_model.dart';
 import 'needs_attention_view.dart';
 
 class NeedsAttentionPage extends StatelessWidget {
-  const NeedsAttentionPage({super.key, required this.borrower});
+  const NeedsAttentionPage({super.key, required this.member});
 
-  final BorrowerModel borrower;
+  final BorrowerModel member;
 
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(title: Text(borrower.name)),
-      body: NeedsAttentionView(borrower: borrower),
+      appBar: AppBar(title: Text(member.name)),
+      body: NeedsAttentionView(member: member),
     );
   }
 }

apps/librarian/lib/modules/borrowers/details/needs_attention_view.dart → apps/librarian/lib/modules/members/details/needs_attention_view.dart

@@ -2,22 +2,22 @@ import 'package:flutter/material.dart';
 import 'package:librarian_app/core/api/models/borrower_model.dart';
 
 class NeedsAttentionView extends StatelessWidget {
-  final BorrowerModel borrower;
+  final BorrowerModel member;
 
-  const NeedsAttentionView({super.key, required this.borrower});
+  const NeedsAttentionView({super.key, required this.member});
 
   @override
   Widget build(BuildContext context) {
-    if (borrower.issues.isEmpty) {
+    if (member.issues.isEmpty) {
       return const Center(child: Text('Ready to borrow!'));
     }
 
     return Padding(
       padding: const EdgeInsets.all(8),
       child: ListView.builder(
-        itemCount: borrower.issues.length,
+        itemCount: member.issues.length,
         itemBuilder: (context, index) {
-          final reason = borrower.issues[index];
+          final reason = member.issues[index];
 
           return Card(
             child: Padding(

apps/librarian/lib/modules/borrowers/details/payments_card.dart → apps/librarian/lib/modules/members/details/payments_card.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:intl/intl.dart';
-import 'package:librarian_app/modules/borrowers/providers/borrowers_repository_provider.dart';
-import 'package:librarian_app/modules/borrowers/providers/selected_borrower_provider.dart';
+import 'package:librarian_app/modules/members/providers/borrowers_repository_provider.dart';
+import 'package:librarian_app/modules/members/providers/selected_borrower_provider.dart';
 import 'package:librarian_app/widgets/details_card/card_body.dart';
 import 'package:librarian_app/widgets/details_card/card_header.dart';
 import 'package:librarian_app/widgets/details_card/details_card.dart';

apps/librarian/lib/modules/borrowers/list/borrowers_list_view.dart → apps/librarian/lib/modules/members/list/members_list_view.dart

@@ -1,14 +1,14 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:librarian_app/modules/borrowers/providers/borrowers_provider.dart';
-import 'package:librarian_app/modules/borrowers/providers/edited_borrower_details_providers.dart';
-import 'package:librarian_app/modules/borrowers/providers/selected_borrower_provider.dart';
+import 'package:librarian_app/modules/members/providers/borrowers_provider.dart';
+import 'package:librarian_app/modules/members/providers/edited_borrower_details_providers.dart';
+import 'package:librarian_app/modules/members/providers/selected_borrower_provider.dart';
 
 import '../../../core/api/models/borrower_model.dart';
-import 'borrowers_list.dart';
+import 'members_list.dart';
 
-class BorrowersListView extends ConsumerWidget {
-  const BorrowersListView({super.key, this.onTap});
+class MembersListView extends ConsumerWidget {
+  const MembersListView({super.key, this.onTap});
 
   final void Function(BorrowerModel)? onTap;
 

apps/librarian/lib/modules/borrowers/list/searchable_borrowers_list.dart → apps/librarian/lib/modules/members/list/searchable_members_list.dart

@@ -1,15 +1,15 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:librarian_app/core/api/models/borrower_model.dart';
-import 'package:librarian_app/modules/borrowers/providers/borrowers_filter_provider.dart';
-import 'package:librarian_app/modules/borrowers/list/borrowers_list_view.dart';
+import 'package:librarian_app/modules/members/providers/borrowers_filter_provider.dart';
+import 'package:librarian_app/modules/members/list/members_list_view.dart';
 
 import '../../../widgets/fields/submit_text_field.dart';
 
-class SearchableBorrowersList extends ConsumerWidget {
+class SearchableMembersList extends ConsumerWidget {
   final void Function(BorrowerModel borrower)? onTapBorrower;
 
-  const SearchableBorrowersList({
+  const SearchableMembersList({
     super.key,
     this.onTapBorrower,
   });
@@ -35,7 +35,7 @@ class SearchableBorrowersList extends ConsumerWidget {
           ),
         ),
         Expanded(
-          child: BorrowersListView(onTap: onTapBorrower),
+          child: MembersListView(onTap: onTapBorrower),
         ),
       ],
     );

apps/librarian/lib/modules/borrowers/providers/borrower_details_provider.dart → apps/librarian/lib/modules/members/providers/borrower_details_provider.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:librarian_app/modules/borrowers/providers/borrowers_repository_provider.dart';
-import 'package:librarian_app/modules/borrowers/providers/selected_borrower_provider.dart';
+import 'package:librarian_app/modules/members/providers/borrowers_repository_provider.dart';
+import 'package:librarian_app/modules/members/providers/selected_borrower_provider.dart';
 
 import '../../../core/api/models/borrower_model.dart';
 

apps/librarian/lib/modules/borrowers/providers/borrowers_provider.dart → apps/librarian/lib/modules/members/providers/borrowers_provider.dart

@@ -1,7 +1,7 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:librarian_app/core/api/models/borrower_model.dart';
-import 'package:librarian_app/modules/borrowers/providers/borrowers_filter_provider.dart';
-import 'package:librarian_app/modules/borrowers/providers/borrowers_repository_provider.dart';
+import 'package:librarian_app/modules/members/providers/borrowers_filter_provider.dart';
+import 'package:librarian_app/modules/members/providers/borrowers_repository_provider.dart';
 
 final borrowersProvider = Provider<Future<List<BorrowerModel>>>((ref) async {
   final searchFilter = ref.watch(borrowersFilterProvider);

apps/librarian/lib/modules/borrowers/providers/edited_borrower_details_providers.dart → apps/librarian/lib/modules/members/providers/edited_borrower_details_providers.dart

@@ -1,7 +1,7 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:librarian_app/modules/borrowers/providers/borrower_details_provider.dart';
-import 'package:librarian_app/modules/borrowers/providers/borrowers_repository_provider.dart';
-import 'package:librarian_app/modules/borrowers/providers/selected_borrower_provider.dart';
+import 'package:librarian_app/modules/members/providers/borrower_details_provider.dart';
+import 'package:librarian_app/modules/members/providers/borrowers_repository_provider.dart';
+import 'package:librarian_app/modules/members/providers/selected_borrower_provider.dart';
 import 'package:librarian_app/modules/loans/providers/loans_repository_provider.dart';
 
 final phoneProvider = StateProvider<String?>((ref) => null);