Merge pull request #36 from pvdthings/release/1.0-beta-8

Release 1.0 Beta 8

README.md

@@ -14,11 +14,11 @@ Without a `SUPABASE_URL`, attempting signin will result in a 404 error.
 
 ## Project Structure
 
-The app is broken down into features or modules, each containing directories for `data`, `widgets`, and `views`.
+The app is broken down into features or modules, each containing directories for `data`, `widgets`, and `pages`.
 
 - `data` contains Models, ViewModels, Repostories, or any other business logic.
-- `widgets` contains UI components that have no knowledge of the ViewModel.
-- `views` contains UI components that _do_ have knowledge of the ViewModel. Pages are the most common, but there may be smaller views that compose a page.
+- `widgets` contains UI components that compose larger widgets or pages.
+- `pages` contains UI components that represent pages. Generally wrapped in a `Scaffold` widget.
 
 ## Background
 

lib/main.dart

@@ -1,15 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:librarian_app/constants.dart';
-import 'package:librarian_app/src/features/borrowers/data/borrowers_view_model.dart';
-import 'package:librarian_app/src/features/inventory/data/inventory_view_model.dart';
-import 'package:librarian_app/src/features/loans/data/loans_view_model.dart';
-import 'package:librarian_app/src/features/authentication/data/user_view_model.dart';
-import 'package:librarian_app/src/features/splash/views/splash_page.dart';
+import 'package:librarian_app/src/features/borrowers/data/borrowers.vm.dart';
+import 'package:librarian_app/src/features/inventory/data/inventory.vm.dart';
+import 'package:librarian_app/src/features/loans/data/loans.vm.dart';
+import 'package:librarian_app/src/features/authentication/data/user.vm.dart';
+import 'package:librarian_app/src/features/splash/pages/splash.page.dart';
 import 'package:provider/provider.dart';
 import 'package:supabase_flutter/supabase_flutter.dart' as supabase;
 
-import 'src/features/loans/data/things_view_model.dart';
-
 Future<void> main() async {
   WidgetsFlutterBinding.ensureInitialized();
 
@@ -29,9 +27,6 @@ Future<void> main() async {
       ChangeNotifierProvider<BorrowersViewModel>(
         create: (context) => BorrowersViewModel(),
       ),
-      ChangeNotifierProvider<ThingsViewModel>(
-        create: (context) => ThingsViewModel(),
-      ),
       ChangeNotifierProvider<InventoryViewModel>(
         create: (context) => InventoryViewModel(),
       ),

lib/src/features/authentication/data/user.model.dart

@@ -0,0 +1,15 @@
+import 'package:supabase_flutter/supabase_flutter.dart';
+
+class UserModel {
+  final String name;
+
+  const UserModel({required this.name});
+
+  factory UserModel.from(User? supabaseUser) {
+    final name = supabaseUser?.userMetadata?['full_name'] ??
+        supabaseUser?.email ??
+        'Alice';
+
+    return UserModel(name: name);
+  }
+}

lib/src/features/authentication/data/user.vm.dart

@@ -0,0 +1,21 @@
+import 'package:flutter/material.dart';
+import 'package:librarian_app/src/features/authentication/data/user.model.dart';
+import 'package:librarian_app/src/features/authentication/services/authentication.service.dart';
+
+class UserViewModel extends ChangeNotifier {
+  final service = AuthenticationService();
+
+  bool get signedIn => service.hasValidSession;
+
+  UserModel get user => service.currentUser;
+
+  Future<void> signIn() async {
+    await service.signIn();
+    notifyListeners();
+  }
+
+  Future<void> signOut() async {
+    await service.signOut();
+    notifyListeners();
+  }
+}

lib/src/features/authentication/pages/signin/index.dart

@@ -0,0 +1 @@
+export 'signin.page.dart';

lib/src/features/authentication/pages/signin/signin.page.dart

@@ -0,0 +1,69 @@
+import 'package:flutter/material.dart';
+import 'package:librarian_app/src/features/authentication/data/user.vm.dart';
+import 'package:librarian_app/src/features/authentication/pages/signin/widgets/discord_button.widget.dart';
+import 'package:librarian_app/src/features/dashboard/pages/dashboard.page.dart';
+import 'package:provider/provider.dart';
+
+class SignInPage extends StatefulWidget {
+  const SignInPage({super.key});
+
+  @override
+  State<StatefulWidget> createState() {
+    return _SignInPageState();
+  }
+}
+
+class _SignInPageState extends State<SignInPage> {
+  String? _errorMessage;
+
+  void _navigateToDashboard() {
+    Navigator.of(context).pushAndRemoveUntil(
+      MaterialPageRoute(builder: (_) => const DashboardPage()),
+      (route) => false,
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Padding(
+        padding: const EdgeInsets.all(16),
+        child: Center(
+          child: Consumer<UserViewModel>(
+            builder: (context, viewModel, child) {
+              return Column(
+                crossAxisAlignment: CrossAxisAlignment.center,
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  Image.asset(
+                    "pvd_things.png",
+                    isAntiAlias: true,
+                    width: 160,
+                  ),
+                  const SizedBox(height: 32),
+                  DiscordSigninButton(
+                    signIn: viewModel.signIn,
+                    onSignedIn: _navigateToDashboard,
+                    onError: (error) {
+                      setState(() => _errorMessage = error);
+                    },
+                  ),
+                  if (_errorMessage != null) const SizedBox(height: 16),
+                  if (_errorMessage != null) Text(_errorMessage!),
+                  const SizedBox(height: 32),
+                  const Card(
+                    child: Padding(
+                      padding: EdgeInsets.all(16),
+                      child: Text(
+                          'Only authorized users can sign in.\nPlease ask the PVD Things Digital Team for volunteer access.'),
+                    ),
+                  ),
+                ],
+              );
+            },
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/src/features/authentication/pages/signin/widgets/discord_button.widget.dart

@@ -0,0 +1,43 @@
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:supabase_flutter/supabase_flutter.dart';
+
+class DiscordSigninButton extends StatelessWidget {
+  final Future<void> Function()? signIn;
+  final void Function()? onSignedIn;
+  final void Function(String)? onError;
+
+  const DiscordSigninButton({
+    super.key,
+    this.signIn,
+    this.onSignedIn,
+    this.onError,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return ElevatedButton.icon(
+      icon: const Icon(Icons.discord_rounded),
+      label: const Text('Sign in with Discord'),
+      onPressed: () async {
+        if (kDebugMode) {
+          onSignedIn?.call();
+          return;
+        }
+
+        try {
+          await signIn?.call();
+          onSignedIn?.call();
+        } on AuthException catch (error) {
+          onError?.call(error.toString());
+        } catch (error) {
+          onError?.call("An unexpected error occurred.");
+        }
+      },
+      style: ElevatedButton.styleFrom(
+        textStyle: const TextStyle(fontSize: 20),
+        padding: const EdgeInsets.all(16),
+      ),
+    );
+  }
+}

lib/src/features/authentication/services/authentication.service.dart

@@ -0,0 +1,20 @@
+import 'package:supabase_flutter/supabase_flutter.dart';
+
+import '../data/user.model.dart';
+
+class AuthenticationService {
+  static SupabaseClient get _supabase => Supabase.instance.client;
+  static User? get _currentUser => _supabase.auth.currentUser;
+
+  bool get hasValidSession => _supabase.auth.currentSession != null;
+
+  UserModel get currentUser => UserModel.from(_currentUser);
+
+  Future<void> signIn() async {
+    await _supabase.auth.signInWithOAuth(Provider.discord);
+  }
+
+  Future<void> signOut() async {
+    await _supabase.auth.signOut();
+  }
+}

lib/src/features/borrowers/data/borrowers_view_model.dart → lib/src/features/borrowers/data/borrowers.vm.dart

@@ -2,7 +2,7 @@ import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 import 'package:librarian_app/src/features/common/data/lending_api.dart';
 
-import 'borrower_model.dart';
+import 'borrower.model.dart';
 import 'borrowers_mapper.dart';
 
 class BorrowersViewModel extends ChangeNotifier {

lib/src/features/borrowers/data/borrowers_mapper.dart

@@ -1,4 +1,4 @@
-import 'borrower_model.dart';
+import 'borrower.model.dart';
 
 class BorrowersMapper {
   static Iterable<BorrowerModel> map(Iterable<dynamic> data) {