ft/adds toasts to api calls

frontend/app/lib/data/database.dart

@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'package:app/pb/session.pbjson.dart';
 import 'package:fixnum/fixnum.dart';
 
 import 'package:app/pb/google/protobuf/timestamp.pb.dart';
@@ -167,7 +166,7 @@ class Session {
     final db = await database;
 
     final List<Map<String, Object?>> maps = await db.query('sessions');
-    print(maps);
+    // print(maps);
     final List<Session> sessions = List.generate(
       maps.length,
       (i) {

frontend/app/lib/main.dart

@@ -41,7 +41,9 @@ void main() async {
             backgroundColor: Colors.black,
             foregroundColor: Colors.white,
           )),
-      home: const HomePage(),
+      home: HomePage(
+        loggedOut: false,
+      ),
     ),
   );
 }

frontend/app/lib/model/apis/api_response.dart

@@ -5,7 +5,7 @@ class ApiResponse<T> {
 
   ApiResponse.initial(this.message) : status = Status.INITIAL;
   ApiResponse.loading(this.message) : status = Status.LOADING;
-  ApiResponse.completed(this.data, this.message) : status = Status.COMPLETED;
+  ApiResponse.completed(this.data) : status = Status.COMPLETED;
   ApiResponse.error(this.message) : status = Status.ERROR;
 
   @override

frontend/app/lib/model/services/backend_service.dart

@@ -3,9 +3,11 @@ import 'dart:io';
 import 'package:app/model/apis/app_exception.dart';
 import 'package:app/pb/account.pb.dart';
 import 'package:app/pb/account_info.pb.dart';
+import 'package:app/pb/google/protobuf/timestamp.pb.dart';
 import 'package:app/pb/person.pb.dart';
 import 'package:app/data/database.dart';
 import 'package:app/pb/rpc_create_account.pb.dart';
+import 'package:app/pb/rpc_create_person.pb.dart';
 import 'package:app/pb/rpc_get_account.pb.dart';
 import 'package:app/pb/rpc_get_account_info.pb.dart';
 import 'package:app/pb/rpc_get_person.pb.dart';
@@ -15,7 +17,6 @@ import 'package:app/pb/rpc_refresh_token.pb.dart';
 import 'package:app/pb/service_df.pbgrpc.dart';
 import 'package:fixnum/fixnum.dart';
 import 'package:grpc/grpc.dart';
-import 'package:sqflite/sqflite.dart';
 
 class BackendService {
   BackendService() {
@@ -138,17 +139,16 @@ class BackendService {
     }
     try {
       final GetAccountResponse response = await _client.getAccount(
-          GetAccountRequest(id: session!.accountId),
+          GetAccountRequest(id: session.accountId),
           options: CallOptions(
               metadata: {'Authorization': 'Bearer ${session.accessToken}'}));
       return response.account;
     } on SocketException {
       throw FetchDataException('Keine Internet Verbindung');
     } on GrpcError catch (err) {
-      // if (err.code == 16) {
+      if (err.code == 16) {
-      //   await refreshToken(session);
+        throw UnauthorizedException(err.message);
-      //   return getAccount();
+      }
-      // }
       throw FetchDataException(err.message);
     } catch (err) {
       throw InternalException(err.toString());
@@ -207,6 +207,47 @@ class BackendService {
     }
   }
 
+  Future<Person> createPerson(
+      {required String firstname,
+      required String lastname,
+      required String street,
+      required String zip,
+      required String city,
+      required String country,
+      required DateTime birthday}) async {
+    Session session = await Session.session;
+    if (session.accessTokenExpiresAt == null) {
+      throw UnauthorizedException('Keine Siztung gefunden');
+    }
+    if (session.accessTokenExpiresAt!.toDateTime().isBefore(DateTime.now())) {
+      session = await refreshToken(session);
+      if (session.accessTokenExpiresAt == null) {
+        throw UnauthorizedException('Sitzung ist abgelaufen');
+      }
+    }
+    try {
+      final CreatePersonResponse response = await _client.createPerson(
+          CreatePersonRequest(
+            accountId: session.accountId,
+            lastname: lastname,
+            firstname: firstname,
+            street: street,
+            zip: zip,
+            country: country,
+            birthday: Timestamp.fromDateTime(birthday),
+          ),
+          options: CallOptions(
+              metadata: {'Authorization': 'Bearer ${session.accessToken}'}));
+      return response.person;
+    } on SocketException {
+      throw FetchDataException('Keine Internet Verbindung');
+    } on GrpcError catch (err) {
+      throw FetchDataException(err.message);
+    } catch (err) {
+      throw InternalException(err.toString());
+    }
+  }
+
   Future<List<Person>> listPersons() async {
     Session session = await Session.session;
     if (session.accessTokenExpiresAt == null) {

frontend/app/lib/model/view_model/account_vm.dart

@@ -1,9 +1,9 @@
 import 'package:app/model/apis/api_response.dart';
 import 'package:app/model/services/backend_service.dart';
+import 'package:app/model/view_model/base_vm.dart';
 import 'package:app/pb/account.pb.dart';
-import 'package:flutter/material.dart';
 
-class AccountViewModel with ChangeNotifier {
+class AccountViewModel extends BaseViewModel {
   AccountViewModel() {
     _init();
   }
@@ -21,36 +21,12 @@ class AccountViewModel with ChangeNotifier {
   }
 
   void _init() async {
-    _apiResponse = ApiResponse.loading('Bereite alles vor');
+    super.init();
-    try {
+    // try {
-      _apiResponse = ApiResponse.completed(await _service.getAccount(), 'done');
+    //   _apiResponse = ApiResponse.completed(await _service.getAccount());
-    } catch (e) {
+    // } catch (e) {
-      _apiResponse = ApiResponse.error(e.toString());
+    //   _apiResponse = ApiResponse.error(e.toString());
-    }
+    // }
-    notifyListeners();
+    // notifyListeners();
-  }
-
-  Future<void> fetchAccount() async {
-    _apiResponse = ApiResponse.loading('Hole Account');
-    notifyListeners();
-    try {
-      _apiResponse = ApiResponse.completed(await _service.getAccount(), 'done');
-    } catch (e) {
-      _apiResponse = ApiResponse.error(e.toString());
-    }
-    notifyListeners();
-  }
-
-  Future<void> logout() async {
-    _apiResponse = ApiResponse.loading('Logge aus');
-    notifyListeners();
-    try {
-      await BackendService.logout();
-      _apiResponse = ApiResponse.completed(null, 'Erfolgreich ausgeloggt');
-    } catch (e) {
-      _apiResponse = ApiResponse.error(e.toString());
-    }
-    print(_apiResponse.message);
-    notifyListeners();
   }
 }

frontend/app/lib/model/view_model/base_vm.dart

@@ -0,0 +1,254 @@
+import 'package:app/model/apis/api_response.dart';
+import 'package:app/model/services/backend_service.dart';
+import 'package:app/pages/home_page.dart';
+import 'package:app/util/colors.dart';
+import 'package:flutter/material.dart';
+
+class BaseViewModel with ChangeNotifier {
+  BaseViewModel() {
+    init();
+  }
+  ApiResponse _apiResponse = ApiResponse.initial('Keine Daten');
+
+  final BackendService _service = BackendService();
+
+  ApiResponse get response {
+    return _apiResponse;
+  }
+
+  void init() async {
+    // if (await BackendService.isLoggedIn) {
+    try {
+      _apiResponse = ApiResponse.completed(await _service.getAccount());
+    } catch (e) {
+      _apiResponse = ApiResponse.error(e.toString());
+    }
+    notifyListeners();
+    // }
+  }
+
+  Future<bool> isLoggedIn(BuildContext context) async {
+    final messenger = ScaffoldMessenger.of(context);
+    final navigator = Navigator.of(context);
+    bool loggedIn = false;
+    try {
+      loggedIn = await BackendService.isLoggedIn;
+    } catch (err) {
+      if (err.toString().contains('session is blocked')) {
+        _apiResponse = ApiResponse.error('Sitzung ist abgelaufen');
+        navigator.pushAndRemoveUntil(
+            MaterialPageRoute(
+                builder: (builder) => HomePage(
+                      loggedOut: true,
+                    )),
+            (route) => false);
+        messenger.showSnackBar(SnackBar(
+          backgroundColor: CustomColors.error,
+          content: const Text(
+            'Sitzung ist abgelaufen',
+            style: TextStyle(color: Colors.white),
+          ),
+          // action: SnackBarAction(
+          //   label: 'Details',
+          //   onPressed: () {
+          //     if (context.mounted) {
+          //       showDialog(
+          //           context: context,
+          //           builder: (context) => AlertDialog(
+          //                 backgroundColor: Colors.black,
+          //                 icon: Icon(
+          //                   Icons.error,
+          //                   color: CustomColors.error,
+          //                 ),
+          //                 content: Text(
+          //                   err.toString(),
+          //                   textAlign: TextAlign.center,
+          //                 ),
+          //               ));
+          //     }
+          //   },
+          // ),
+        ));
+      }
+    }
+    return loggedIn;
+  }
+
+  Future<void> getAccount(BuildContext context) async {
+    _apiResponse = ApiResponse.loading('Lade Daten');
+    notifyListeners();
+    final messenger = ScaffoldMessenger.of(context);
+    try {
+      _apiResponse = ApiResponse.completed(await _service.getAccount());
+    } catch (e) {
+      if (e.toString().contains('session is blocked')) {
+        _apiResponse = ApiResponse.error('Sitzung ist abgelaufen');
+        messenger.showSnackBar(SnackBar(
+          backgroundColor: CustomColors.error,
+          content: const Text(
+            'Sitzung ist abgelaufen',
+            style: TextStyle(color: Colors.white),
+          ),
+          action: SnackBarAction(
+            label: 'Details',
+            onPressed: () {
+              showDialog(
+                  context: context,
+                  builder: (context) => AlertDialog(
+                        backgroundColor: Colors.black,
+                        icon: Icon(
+                          Icons.error,
+                          color: CustomColors.error,
+                        ),
+                        content: Text(
+                          e.toString(),
+                          textAlign: TextAlign.center,
+                        ),
+                      ));
+            },
+          ),
+        ));
+      }
+      messenger.showSnackBar(SnackBar(
+        backgroundColor: CustomColors.error,
+        content: const Text(
+          'Sitzung ist abgelaufen',
+          style: TextStyle(color: Colors.white),
+        ),
+        action: SnackBarAction(
+          label: 'Details',
+          onPressed: () {
+            showDialog(
+                context: context,
+                builder: (context) => AlertDialog(
+                      backgroundColor: Colors.black,
+                      icon: Icon(
+                        Icons.error,
+                        color: CustomColors.error,
+                      ),
+                      content: Text(
+                        e.toString(),
+                        textAlign: TextAlign.center,
+                      ),
+                    ));
+          },
+        ),
+      ));
+      _apiResponse = ApiResponse.error(e.toString());
+    }
+    notifyListeners();
+  }
+
+  Future<void> logout() async {
+    _apiResponse = ApiResponse.loading('Logge aus');
+    notifyListeners();
+    try {
+      await BackendService.logout();
+      _apiResponse = ApiResponse.completed(true);
+    } catch (e) {
+      _apiResponse = ApiResponse.error(e.toString());
+    }
+    print(_apiResponse.message);
+    notifyListeners();
+  }
+
+  Future<bool> login(BuildContext context,
+      {required String email, required String password}) async {
+    bool resp = false;
+    _apiResponse = ApiResponse.loading('Logge ein');
+    notifyListeners();
+    final messenger = ScaffoldMessenger.of(context);
+    try {
+      resp = await BackendService.login(email: email, password: password);
+      _apiResponse = ApiResponse.completed(resp);
+      messenger.showSnackBar(SnackBar(
+        backgroundColor: CustomColors.success,
+        content: const Text(
+          'Erfolgreich eingeloggt',
+          style: TextStyle(color: Colors.white),
+        ),
+      ));
+    } catch (e) {
+      messenger.showSnackBar(SnackBar(
+        backgroundColor: CustomColors.error,
+        content: const Text(
+          'Login fehlgeschlagen',
+          style: TextStyle(color: Colors.white),
+        ),
+        action: SnackBarAction(
+          label: 'Details',
+          onPressed: () {
+            showDialog(
+                context: context,
+                builder: (context) => AlertDialog(
+                      backgroundColor: Colors.black,
+                      icon: Icon(
+                        Icons.error,
+                        color: CustomColors.error,
+                      ),
+                      content: Text(
+                        e.toString(),
+                        textAlign: TextAlign.center,
+                      ),
+                    ));
+          },
+        ),
+      ));
+      _apiResponse = ApiResponse.error(e.toString());
+    }
+    print(_apiResponse.message);
+    notifyListeners();
+    return resp;
+  }
+
+  Future<bool> createAccount(BuildContext context,
+      {required String email, required String password}) async {
+    bool resp = false;
+    final messenger = ScaffoldMessenger.of(context);
+
+    _apiResponse = ApiResponse.loading('Logge ein');
+    notifyListeners();
+    try {
+      resp =
+          await BackendService.createAccount(email: email, password: password);
+      messenger.showSnackBar(SnackBar(
+        backgroundColor: CustomColors.success,
+        content: const Text(
+          'Account angelegt',
+          style: TextStyle(color: Colors.white),
+        ),
+      ));
+      _apiResponse = ApiResponse.completed(resp);
+    } catch (e) {
+      messenger.showSnackBar(SnackBar(
+        backgroundColor: CustomColors.error,
+        content: const Text(
+          'Account anlegen fehlgeschlagen',
+          style: TextStyle(color: Colors.white),
+        ),
+        action: SnackBarAction(
+          label: 'Details',
+          onPressed: () {
+            showDialog(
+                context: context,
+                builder: (context) => AlertDialog(
+                      backgroundColor: Colors.black,
+                      icon: Icon(
+                        Icons.error,
+                        color: CustomColors.error,
+                      ),
+                      content: Text(
+                        e.toString(),
+                        textAlign: TextAlign.center,
+                      ),
+                    ));
+          },
+        ),
+      ));
+      _apiResponse = ApiResponse.error(e.toString());
+    }
+    print(_apiResponse.message);
+    notifyListeners();
+    return resp;
+  }
+}

frontend/app/lib/model/view_model/persons_vm.dart

@@ -1,6 +1,5 @@
 import 'package:app/model/apis/api_response.dart';
 import 'package:app/model/services/backend_service.dart';
-import 'package:app/pb/account.pb.dart';
 import 'package:app/pb/person.pb.dart';
 import 'package:flutter/material.dart';
 
@@ -16,14 +15,43 @@ class PersonsViewModel with ChangeNotifier {
     return _apiResponse;
   }
 
-  void listPersons() async {
+  Future<List<Person>> listPersons() async {
-    _apiResponse = ApiResponse.loading('Bereite alles vor');
+    List<Person> persons = [];
+    _apiResponse = ApiResponse.loading('Lade Daten');
     try {
-      _apiResponse =
+      persons = await _service.listPersons();
-          ApiResponse.completed(await _service.listPersons(), 'done');
+      _apiResponse = ApiResponse.completed(persons);
     } catch (e) {
       _apiResponse = ApiResponse.error(e.toString());
     }
     notifyListeners();
+    return persons;
+  }
+
+  Future<Person> createPerson(BuildContext context,
+      {required String firstname,
+      required String lastname,
+      required String street,
+      required String zip,
+      required String city,
+      required String country,
+      required DateTime birthday}) async {
+    Person person = Person();
+    _apiResponse = ApiResponse.loading('Erstelle Person');
+    try {
+      person = await _service.createPerson(
+          firstname: firstname,
+          lastname: lastname,
+          street: street,
+          zip: zip,
+          city: city,
+          country: country,
+          birthday: birthday);
+      _apiResponse = ApiResponse.completed(person);
+    } catch (err) {
+      _apiResponse = ApiResponse.error(err.toString());
+    }
+    notifyListeners();
+    return person;
   }
 }

frontend/app/lib/pages/home_page.dart

@@ -1,4 +1,3 @@
-import 'package:app/model/apis/api_response.dart';
 import 'package:app/model/services/backend_service.dart';
 import 'package:app/model/view_model/account_vm.dart';
 import 'package:app/pages/login_overlay.dart';
@@ -11,8 +10,11 @@ import 'package:app/widgets/side_drawer_item.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
+// ignore: must_be_immutable
 class HomePage extends StatefulWidget {
-  const HomePage({super.key});
+  HomePage({super.key, required this.loggedOut});
+
+  bool loggedOut;
 
   @override
   State<HomePage> createState() => _HomePageState();
@@ -25,46 +27,42 @@ class _HomePageState extends State<HomePage> {
     _init();
   }
 
+  AccountViewModel vm = AccountViewModel();
   void _init() async {
-    _setLoading(true);
+    // _setLoading(true);
-    _loggedin = await BackendService.isLoggedIn;
+    // _setLoading(widget.loggedOut);
+    // _loading = widget.loggedOut;
+    // _loggedin = await BackendService.isLoggedIn;
     // if (!_loggedin) {
     //   await BackendService.logout();
-    //   Navigator.of(context).pushAndRemoveUntil(
+    //   final navigator = Navigator.of(context);
-    //       MaterialPageRoute(builder: (builder) => HomePage()),
+    //   navigator.pushAndRemoveUntil(
+    //       MaterialPageRoute(
+    //           builder: (builder) => HomePage(
+    //                 loggedOut: true,
+    //               )),
     //       (route) => false);
     // }
     _setLoading(false);
   }
 
+  _isLoggedIn(BuildContext context) async {
+    bool logged = await vm.isLoggedIn(context);
+    _loggedin = logged;
+  }
+
   void _setLoading(bool loading) {
     setState(() {
       _loading = loading;
     });
   }
 
-  void _checkResponse(ApiResponse response) async {
-    print('${response.message}');
-    if (response.status == Status.ERROR &&
-        response.message!.contains('unauthorized')) {
-      await BackendService.logout();
-      Navigator.of(context).pushAndRemoveUntil(
-          MaterialPageRoute(builder: (builder) => const HomePage()),
-          (route) => false);
-    }
-  }
-
   bool _loading = true;
   bool _loggedin = false;
   @override
   Widget build(BuildContext context) {
     return Background(
-      child: ChangeNotifierProvider<AccountViewModel>(
+        child: Scaffold(
-        create: (context) => AccountViewModel(),
-        child: Consumer<AccountViewModel>(
-          builder: (context, value, child) {
-            _checkResponse(value.response);
-            return Scaffold(
       appBar: AppBar(
         automaticallyImplyLeading: false,
         // flexibleSpace: Image.asset(
@@ -98,7 +96,7 @@ class _HomePageState extends State<HomePage> {
           const Spacer(
             flex: 1,
           ),
-                  if (_loggedin && value.response.data != null)
+          if (_loggedin)
             SideDrawerItem(
               onPressed: () async {
                 setState(() {
@@ -108,7 +106,9 @@ class _HomePageState extends State<HomePage> {
                 // ignore: use_build_context_synchronously
                 Navigator.of(context).pushAndRemoveUntil(
                     MaterialPageRoute(
-                                builder: (builder) => const HomePage()),
+                        builder: (builder) => HomePage(
+                              loggedOut: true,
+                            )),
                     (route) => false);
                 setState(() {
                   _loggedin = false;
@@ -126,8 +126,7 @@ class _HomePageState extends State<HomePage> {
           if (!_loggedin) ...[
             BottomNavigationItem(
               onPressed: () async {
-                        final bool res =
+                final bool res = await showLogin(context, registration: true);
-                            await showLogin(context, registration: true);
                 setState(() {
                   _loggedin = res;
                 });
@@ -138,9 +137,9 @@ class _HomePageState extends State<HomePage> {
             ),
             BottomNavigationItem(
               onPressed: () async {
-                        final bool res = await showLogin(context);
+                await showLogin(context);
                 setState(() {
-                          _loggedin = res;
+                  vm.isLoggedIn(context);
                 });
               },
               icon: Icons.login,
@@ -149,9 +148,17 @@ class _HomePageState extends State<HomePage> {
             ),
           ] else
             BottomNavigationItem(
-                      onPressed: () {
+              onPressed: () async {
-                        Navigator.of(context).push(MaterialPageRoute(
+                final navigator = Navigator.of(context);
+                if (await vm.isLoggedIn(context)) {
+                  navigator.push(MaterialPageRoute(
                       builder: (builder) => const PersonsPage()));
+                } else {
+                  navigator.pushAndRemoveUntil(
+                      MaterialPageRoute(
+                          builder: (builder) => const PersonsPage()),
+                      (route) => false);
+                }
               },
               icon: Icons.person_search,
               color: Colors.white,
@@ -167,9 +174,17 @@ class _HomePageState extends State<HomePage> {
         ],
       ),
       body: Padding(
-                padding: const EdgeInsets.fromLTRB(16, 40, 16, 16),
+        padding: const EdgeInsets.fromLTRB(16, 45, 16, 16),
         child: Center(
-                  child: _loading
+          child: ChangeNotifierProvider<AccountViewModel>(
+              create: (context) => AccountViewModel(),
+              child:
+                  Consumer<AccountViewModel>(builder: (context, value, child) {
+                // _checkResponse(value.response);
+                if (!widget.loggedOut) {
+                  _isLoggedIn(context);
+                }
+                return _loading
                     ? const CircularProgressIndicator(
                         color: Colors.grey,
                       )
@@ -194,13 +209,10 @@ class _HomePageState extends State<HomePage> {
                             ),
                           ),
                         ],
-                        ),
-                ),
-              ),
                       );
-          },
+              })),
         ),
       ),
-    );
+    ));
   }
 }

frontend/app/lib/pages/login_overlay.dart

@@ -1,7 +1,12 @@
-import 'package:app/model/services/backend_service.dart';
+import 'package:app/model/view_model/base_vm.dart';
 import 'package:app/widgets/background.dart';
+import 'package:app/widgets/bottom_navigation.dart';
+import 'package:app/widgets/bottom_navigation_item.dart';
+import 'package:app/widgets/side_drawer.dart';
+import 'package:app/widgets/side_drawer_item.dart';
 import 'package:flutter/material.dart';
 import 'package:app/util/validation.dart';
+import 'package:provider/provider.dart';
 
 Future<bool> showLogin(BuildContext context,
     {bool registration = false}) async {
@@ -9,15 +14,17 @@ Future<bool> showLogin(BuildContext context,
   final mailController = TextEditingController();
   final passwordController = TextEditingController();
 
+  BaseViewModel vm = BaseViewModel();
   bool submitted = false;
   bool loggedin = false;
-  void login() {
+  void login(BuildContext context) {
     if (formKey.currentState!.validate()) {
       submitted = true;
-      BackendService.login(
+      FocusScope.of(context).unfocus();
-        email: mailController.text,
+      vm
-        password: passwordController.text,
+          .login(context,
-      ).then(
+              email: mailController.text, password: passwordController.text)
+          .then(
         (r) {
           if (r) {
             loggedin = r;
@@ -25,16 +32,21 @@ Future<bool> showLogin(BuildContext context,
           }
         },
       );
+      passwordController.clear();
+      submitted = false;
     }
   }
 
-  void register() {
+  void register(BuildContext context) {
     if (formKey.currentState!.validate()) {
       submitted = true;
-      BackendService.createAccount(
+      vm
+          .createAccount(
+        context,
         email: mailController.text,
         password: passwordController.text,
-      ).then(
+      )
+          .then(
         (r) {
           if (r) {
             loggedin = r;
@@ -52,6 +64,57 @@ Future<bool> showLogin(BuildContext context,
       context: context,
       builder: (builder) {
         return Background(
+          child: Scaffold(
+            drawer: SideDrawer(
+              children: [
+                const Spacer(
+                  flex: 3,
+                ),
+                SideDrawerItem(
+                  onPressed: () {},
+                  icon: Icons.question_answer,
+                  color: Colors.white,
+                  label: 'About',
+                ),
+                SideDrawerItem(
+                  onPressed: () {},
+                  icon: Icons.privacy_tip,
+                  color: Colors.white,
+                  label: 'Datenschutz',
+                ),
+                SideDrawerItem(
+                  onPressed: () {},
+                  icon: Icons.apartment,
+                  color: Colors.white,
+                  label: 'Impressum',
+                ),
+                const Spacer(
+                  flex: 1,
+                ),
+              ],
+            ),
+            bottomNavigationBar: BottomNavigation(
+              children: [
+                BottomNavigationItem(
+                  onPressed: () {
+                    Navigator.pop(context, false);
+                  },
+                  icon: Icons.arrow_back,
+                  color: Colors.white,
+                  label: 'Zurück',
+                ),
+                BottomNavigationItem(
+                  onPressed: () {
+                    Navigator.pop(context, false);
+                  },
+                  icon: Icons.home,
+                  color: Colors.white,
+                  label: 'Home',
+                ),
+              ],
+            ),
+            body: Padding(
+              padding: const EdgeInsets.all(16.0),
               child: Column(
                 mainAxisAlignment: MainAxisAlignment.center,
                 children: [
@@ -77,7 +140,10 @@ Future<bool> showLogin(BuildContext context,
                       letterSpacing: 6,
                     ),
                   ),
-              Form(
+                  ChangeNotifierProvider<BaseViewModel>(
+                    create: (context) => BaseViewModel(),
+                    child: Consumer<BaseViewModel>(
+                      builder: (context, value, child) => Form(
                         key: formKey,
                         child: Column(
                           mainAxisAlignment: MainAxisAlignment.spaceEvenly,
@@ -87,7 +153,7 @@ Future<bool> showLogin(BuildContext context,
                               height: 40,
                             ),
                             TextFormField(
-                      autofocus: true,
+                              // autofocus: true,
                               // inputFormatters: [
                               //   FilteringTextInputFormatter.allow(
                               //     emailRegExp,
@@ -143,19 +209,15 @@ Future<bool> showLogin(BuildContext context,
                             Row(
                               mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                               children: [
-                        ElevatedButton(
-                          onPressed: !submitted
-                              ? () {
-                                  Navigator.pop(context);
-                                }
-                              : null,
-                          child: const Icon(Icons.arrow_back),
-                        ),
                                 ElevatedButton(
                                   onPressed: !submitted
                                       ? !registration
-                                  ? login
+                                          ? () {
-                                  : register
+                                              login(context);
+                                            }
+                                          : () {
+                                              register(context);
+                                            }
                                       : null,
                                   child: const Icon(Icons.login),
                                 ),
@@ -164,9 +226,13 @@ Future<bool> showLogin(BuildContext context,
                           ],
                         ),
                       ),
+                    ),
+                  ),
                   const Spacer(),
                 ],
               ),
+            ),
+          ),
         );
       });
   return loggedin;

frontend/app/lib/pages/persons_page.dart

@@ -42,13 +42,23 @@ class _PersonsPageState extends State<PersonsPage> {
         response.message!.contains('unauthenticated')) {
       BackendService.logout();
       Navigator.of(context).pushAndRemoveUntil(
-          MaterialPageRoute(builder: (builder) => const HomePage()),
+          MaterialPageRoute(
+              builder: (builder) => HomePage(
+                    loggedOut: true,
+                  )),
           (route) => false);
     }
   }
 
   bool _loading = true;
   bool _loggedin = false;
+  List<Person> persons = [];
+
+  PersonsViewModel vm = PersonsViewModel();
+
+  void listPersons(BuildContext context) async {
+    persons = await vm.listPersons();
+  }
 
   List<Widget> _personsList(List<Person> persons) {
     final List<Widget> list = [];
@@ -67,14 +77,8 @@ class _PersonsPageState extends State<PersonsPage> {
   @override
   Widget build(BuildContext context) {
     return Background(
-      child: ChangeNotifierProvider<PersonsViewModel>(
+      child: Scaffold(
-        create: (context) => PersonsViewModel(),
+        floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat,
-        child: Consumer<PersonsViewModel>(
-          builder: (context, value, child) {
-            _checkResponse(value.response);
-            return Scaffold(
-              floatingActionButtonLocation:
-                  FloatingActionButtonLocation.centerFloat,
         floatingActionButton: FloatingActionButton(
           onPressed: () {},
           child: const Icon(Icons.add),
@@ -108,7 +112,7 @@ class _PersonsPageState extends State<PersonsPage> {
             const Spacer(
               flex: 1,
             ),
-                  if (_loggedin || value.response.data != null)
+            if (_loggedin)
               SideDrawerItem(
                 onPressed: () async {
                   setState(() {
@@ -118,7 +122,9 @@ class _PersonsPageState extends State<PersonsPage> {
                   // ignore: use_build_context_synchronously
                   Navigator.of(context).pushAndRemoveUntil(
                       MaterialPageRoute(
-                                builder: (builder) => const HomePage()),
+                          builder: (builder) => HomePage(
+                                loggedOut: true,
+                              )),
                       (route) => false);
                   setState(() {
                     _loggedin = false;
@@ -152,23 +158,27 @@ class _PersonsPageState extends State<PersonsPage> {
         body: Padding(
           padding: const EdgeInsets.all(16),
           child: Center(
-                  child: _loading
+            child: ChangeNotifierProvider<PersonsViewModel>(
+              create: (context) => PersonsViewModel(),
+              child: Consumer<PersonsViewModel>(
+                builder: (context, value, child) {
+                  _checkResponse(value.response);
+                  listPersons(context);
+                  return _loading
                       ? const CircularProgressIndicator(
                           color: Colors.grey,
                         )
                       : value.response.status == Status.COMPLETED
                           ? value.response.data.length > 0
-                              ? ListView(
+                              ? ListView(children: _personsList(persons))
-                                  children: _personsList(
-                                      (value.response.data as List<Person>)))
                               : const Text('Noch keine Personen angelegt')
-                          : const Text('Lade Daten...'),
+                          : const Text('Lade Daten...');
-                ),
-              ),
-            );
                 },
               ),
             ),
+          ),
+        ),
+      ),
     );
   }
 }

frontend/app/lib/util/colors.dart

@@ -0,0 +1,11 @@
+import 'package:flutter/material.dart';
+
+class CustomColors {
+  static Color get error {
+    return const Color.fromARGB(200, 255, 90, 90);
+  }
+
+  static Color get success {
+    return const Color.fromARGB(200, 55, 125, 55);
+  }
+}

frontend/app/lib/widgets/bottom_navigation.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 
+// ignore: must_be_immutable
 class BottomNavigation extends StatelessWidget {
   BottomNavigation({
     super.key,

frontend/app/lib/widgets/bottom_navigation_item.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 
+// ignore: must_be_immutable
 class BottomNavigationItem extends StatelessWidget {
   BottomNavigationItem({
     super.key,

frontend/app/lib/widgets/drawer.dart

@@ -1,13 +1,12 @@
-import 'package:app/pages/home_page.dart';
-import 'package:app/widgets/side_drawer_item.dart';
 import 'package:flutter/material.dart';
 
+// ignore: must_be_immutable
 class SideDrawer extends StatelessWidget {
   SideDrawer({super.key, required this.children, this.backgroundColor}) {
     backgroundColor ??= Colors.black;
   }
 
-  List<Widget> children;
+  final List<Widget> children;
   Color? backgroundColor;
 
   @override

frontend/app/lib/widgets/side_drawer_item.dart

@@ -1,6 +1,6 @@
-import 'package:app/pages/home_page.dart';
 import 'package:flutter/material.dart';
 
+// ignore: must_be_immutable
 class SideDrawerItem extends StatelessWidget {
   SideDrawerItem({
     super.key,