Merge pull request #89 from pvdthings/dev

Release
pvdthings · Nov 9, 2024 · 1fe5a4b · 1fe5a4b
2 parents 93340c4 + 39d8681
commit 1fe5a4b
Show file tree

Hide file tree

Showing 40 changed files with 546 additions and 610 deletions.
diff --git a/...ard/layouts/borrowers_desktop_layout.dart → ...board/layouts/members_desktop_layout.dart b/...ard/layouts/borrowers_desktop_layout.dart → ...board/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),
           ),
         ),

diff --git a/apps/librarian/lib/dashboard/pages/dashboard_page.dart b/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),

diff --git a/apps/librarian/lib/dashboard/providers/create_loan_controller.dart b/apps/librarian/lib/dashboard/providers/create_loan_controller.dart
@@ -3,7 +3,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:librarian_app/dashboard/providers/workspace.dart';
 import 'package:librarian_app/dashboard/widgets/workspace_window.dart';
 import 'package:librarian_app/modules/loans/checkout/checkout_page.dart';
-import 'package:librarian_app/modules/loans/checkout/checkout_stepper.dart';
+import 'package:librarian_app/modules/loans/checkout/stepper/checkout_stepper.dart';
 import 'package:librarian_app/utils/media_query.dart';
 
 class CreateLoanController {

diff --git a/apps/librarian/lib/dashboard/widgets/desktop_dashboard.dart b/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(

diff --git a/apps/librarian/lib/modules/loans/checkout/checkout_page.dart b/apps/librarian/lib/modules/loans/checkout/checkout_page.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:librarian_app/modules/loans/checkout/checkout_stepper.dart';
+import 'package:librarian_app/modules/loans/checkout/stepper/checkout_stepper.dart';
 
 class CheckoutPage extends StatelessWidget {
   const CheckoutPage({super.key});

diff --git a/apps/librarian/lib/modules/loans/checkout/checkout_stepper.dart b/apps/librarian/lib/modules/loans/checkout/checkout_stepper.dart