ft/adds landing page and refactors navigation

frontend/app/lib/main.dart

@@ -1,3 +1,4 @@
+import 'package:app/pages/home_page.dart';
 import 'package:app/pages/login_page.dart';
 import 'package:app/widgets/background.dart';
 import 'package:flutter/material.dart';
@@ -42,7 +43,9 @@ void main() async {
             backgroundColor: Colors.black,
             foregroundColor: Colors.white,
           )),
-      home: const Background(child: LoginPage()),
+      home: const Background(
+        child: HomePage(),
+      ),
     ),
   );
 }

frontend/app/lib/pages/home_page.dart

@@ -0,0 +1,154 @@
+import 'package:app/gapi/client.dart';
+import 'package:app/pages/login_page.dart';
+import 'package:app/pages/start_page.dart';
+import 'package:flutter/material.dart';
+import 'package:app/pages/pages.dart';
+
+Map<Pages, List<BottomNavigationBarItem>> bottomBarButtons = {
+  Pages.start: const [
+    BottomNavigationBarItem(
+      label: 'Zurueck',
+      backgroundColor: Colors.white,
+      icon: Icon(
+        Icons.arrow_back,
+        color: Colors.white,
+      ),
+    ),
+    BottomNavigationBarItem(
+      backgroundColor: Colors.white,
+      label: 'AccountInf',
+      icon: Icon(
+        Icons.person,
+        color: Colors.white,
+      ),
+    ),
+  ],
+  Pages.persons: const [
+    BottomNavigationBarItem(
+      label: 'Zurueck',
+      backgroundColor: Colors.white,
+      icon: Icon(
+        Icons.arrow_back,
+        color: Colors.white,
+      ),
+    ),
+    BottomNavigationBarItem(
+      backgroundColor: Colors.white,
+      label: 'AccountInf',
+      icon: Icon(
+        Icons.person,
+        color: Colors.white,
+      ),
+    ),
+  ],
+  Pages.about: const [
+    BottomNavigationBarItem(
+      label: 'Zurueck',
+      backgroundColor: Colors.white,
+      icon: Icon(
+        Icons.arrow_back,
+        color: Colors.white,
+      ),
+    ),
+    BottomNavigationBarItem(
+      backgroundColor: Colors.white,
+      label: 'AccountInf',
+      icon: Icon(
+        Icons.person,
+        color: Colors.white,
+      ),
+    ),
+  ],
+  Pages.login: const [
+    BottomNavigationBarItem(
+      label: 'Zurueck',
+      backgroundColor: Colors.white,
+      icon: Icon(
+        Icons.arrow_back,
+        color: Colors.white,
+      ),
+    ),
+    BottomNavigationBarItem(
+      backgroundColor: Colors.white,
+      label: 'AccountInf',
+      icon: Icon(
+        Icons.person,
+        color: Colors.white,
+      ),
+    ),
+  ]
+};
+
+class HomePage extends StatefulWidget {
+  const HomePage({super.key});
+
+  @override
+  State<HomePage> createState() => _HomePageState();
+}
+
+class _HomePageState extends State<HomePage> {
+  bool _loading = false;
+
+  Pages _selectedPage = Pages.start;
+
+  Widget _selectPage(Pages page) {
+    switch (page) {
+      case Pages.login:
+        return const LoginPage();
+      default:
+        return StartPage(onChangePage: changePage);
+    }
+  }
+
+  Future<bool> _onWillPop() async {
+    changePage(Pages.start);
+    return false;
+  }
+
+  void changePage(Pages page) {
+    if (!Pages.values.contains(page)) {
+      page = _selectedPage;
+    }
+    setState(() {
+      _selectedPage = page;
+    });
+  }
+
+  void _setLoading(bool loading) {
+    setState(() {
+      _loading = loading;
+    });
+  }
+
+  final Client client = Client();
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: _selectedPage == 'start'
+          ? AppBar(
+              automaticallyImplyLeading: false,
+            )
+          : AppBar(
+              automaticallyImplyLeading: false,
+              flexibleSpace: Image.asset(
+                'lib/assets/logo_300x200.png',
+                height: 80,
+              ),
+            ),
+      bottomNavigationBar: BottomNavigationBar(
+        items: bottomBarButtons[_selectedPage]!.toList(),
+        backgroundColor: Colors.transparent,
+      ),
+      body: Container(
+        padding: const EdgeInsets.fromLTRB(16, 32, 16, 32),
+        child: Center(
+          child: WillPopScope(
+            child: _selectPage(_selectedPage),
+            onWillPop: () => _onWillPop(),
+          ),
+        ),
+      ),
+    );
+  }
+}

frontend/app/lib/pages/login_page.dart

@@ -27,36 +27,7 @@ class _LoginPageState extends State<LoginPage> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return !_loading
-      appBar: AppBar(
-        automaticallyImplyLeading: false,
-        flexibleSpace: Image.asset(
-          'lib/assets/logo_300x200.png',
-          height: 80,
-        ),
-      ),
-      bottomNavigationBar: BottomNavigationBar(
-        items: const [
-          BottomNavigationBarItem(
-            label: 'Zurueck',
-            backgroundColor: Colors.white,
-            icon: Icon(
-              Icons.arrow_back,
-              color: Colors.white,
-            ),
-          ),
-          BottomNavigationBarItem(
-            backgroundColor: Colors.white,
-            label: 'AccountInf',
-            icon: Icon(
-              Icons.person,
-              color: Colors.white,
-            ),
-          ),
-        ],
-        backgroundColor: Colors.transparent,
-      ),
-      body: !_loading
         ? Form(
             key: _formKey,
             child: Column(
@@ -133,14 +104,14 @@ class _LoginPageState extends State<LoginPage> {
                             .then(
                           (r) {
                             if (r.accessToken != '') {
-                                Navigator.pushAndRemoveUntil(
+                              Navigator.push(
                                 context,
                                 MaterialPageRoute(
                                   builder: (ctx) => DashboardPage(
                                     client: client,
                                   ),
                                 ),
-                                    (route) => false);
+                              );
                             }
                             // _setLoading(false);
                           },
@@ -151,7 +122,6 @@ class _LoginPageState extends State<LoginPage> {
               ],
             ),
           )
-          : const LoadingWidget(),
+        : const LoadingWidget();
-    );
   }
 }

frontend/app/lib/pages/pages.dart

@@ -0,0 +1 @@
+enum Pages { start, login, about, persons }

frontend/app/lib/pages/start_page.dart

@@ -0,0 +1,87 @@
+import 'package:app/pages/pages.dart';
+import 'package:flutter/material.dart';
+import 'dart:core';
+
+class StartPage extends StatelessWidget {
+  StartPage({
+    super.key,
+    required this.onChangePage,
+  });
+
+  void Function(Pages page) onChangePage;
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      mainAxisAlignment: MainAxisAlignment.center,
+      children: [
+        const Image(
+          image: AssetImage(
+            'lib/assets/logo_300x200.png',
+          ),
+        ),
+        // Text(
+        //   'Peace of Mind \nin the\nAfterlife',
+        //   textAlign: TextAlign.center,
+        //   style: TextStyle(
+        //     fontFamily: 'JosefinSans',
+        //     height: 1.7,
+        //     letterSpacing: 8,
+        //     wordSpacing: 2,
+        //     fontWeight: FontWeight.bold,
+        //     fontSize: 32,
+        //     color: Colors.white,
+        //     decoration: TextDecoration.none,
+        //     decorationColor: Colors.white,
+        //   ),
+        // ),
+        const SizedBox(
+          height: 40,
+        ),
+        Text(
+          'Digitale Spuren auf Knopfdruck entfernen'.toUpperCase(),
+          textAlign: TextAlign.center,
+          style: const TextStyle(
+            fontFamily: 'sans-serif',
+            fontSize: 24,
+            height: 1.6,
+            fontWeight: FontWeight.normal,
+            letterSpacing: 6,
+          ),
+        ),
+        const Spacer(),
+        Row(
+          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+          crossAxisAlignment: CrossAxisAlignment.center,
+          children: [
+            ElevatedButton.icon(
+              label: const Text('Login'),
+              onPressed: () {
+                onChangePage(Pages.login);
+              },
+              icon: const Icon(
+                Icons.login,
+                semanticLabel: 'Login',
+                size: 16,
+              ),
+            ),
+            ElevatedButton.icon(
+              label: const Text('Registrieren'),
+              onPressed: () {},
+              icon: const Icon(
+                Icons.person_add,
+                semanticLabel: 'Register',
+                size: 16,
+              ),
+            ),
+          ],
+        ),
+        // const SizedBox(
+        //   height: 32,
+        // ),
+
+        // const Text('data'),
+      ],
+    );
+  }
+}

frontend/app/pubspec.yaml

@@ -81,8 +81,12 @@ flutter:
   # "family" key with the font family name, and a "fonts" key with a
   # list giving the asset and other descriptors for the font. For
   # example:
-  # fonts:
+  fonts:
-  #   - family: Schyler
+    - family: JosefinSans
+      fonts:
+        - asset: lib/assets/fonts/JosefinSans-Italic-VariableFont_wght.ttf
+          style: italic
+        - asset: lib/assets/fonts/JosefinSans-VariableFont_wght.ttf
   #     fonts:
   #       - asset: fonts/Schyler-Regular.ttf
   #       - asset: fonts/Schyler-Italic.ttf