menu done

Mobile/lib/base/sidemenu.dart

@@ -0,0 +1,104 @@
+import 'package:flutter/material.dart';
+
+class SideMenu extends StatefulWidget {
+  final Widget body;
+
+  const SideMenu({Key? key, required this.body}) : super(key: key);
+
+  @override
+  State<SideMenu> createState() => _SideMenuState();
+}
+
+class _SideMenuState extends State<SideMenu> {
+  int _selectedIndex = 0;
+
+  void _onItemTapped(int index) {
+    setState(() {
+      _selectedIndex = index;
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        backgroundColor: Theme.of(context).colorScheme.inversePrimary,
+        title: const Text('SkanTavels'),
+      ),
+      drawer: Drawer(
+        child: ListView(
+          padding: EdgeInsets.zero,
+          children: [
+            const DrawerHeader(
+              decoration: BoxDecoration(
+                color: Colors.blue,
+              ),
+              child: Text('Drawer Header'),
+            ),
+            ListTile(
+              title: const Text('Home'),
+              leading: const Icon(Icons.home),
+              selected: _selectedIndex == 0,
+              onTap: () {
+                // Update the state of the app
+                _onItemTapped(0);
+                // Then close the drawer
+                Navigator.pushReplacementNamed(context, '/home');
+              },
+            ),
+            ListTile(
+              title: const Text('Favourites'),
+              leading: const Icon(Icons.star),
+              selected: _selectedIndex == 1,
+              onTap: () {
+                // Update the state of the app
+                _onItemTapped(1);
+                // Then close the drawer
+                Navigator.pop(context);
+              },
+            ),
+            ListTile(
+              title: const Text('Profile'),
+              leading: const Icon(Icons.person),
+              selected: _selectedIndex == 2,
+              onTap: () {
+                // Update the state of the app
+                _onItemTapped(2);
+                // Then close the drawer
+                Navigator.pushReplacementNamed(context, '/profile');
+              },
+            ),
+            const Divider(
+              color: Colors.grey,
+              thickness: 2,
+              indent: 40,
+            ),
+            ListTile(
+              title: const Text('Register'),
+              leading: const Icon(Icons.add_box_outlined),
+              selected: _selectedIndex == 3,
+              onTap: () {
+                // Update the state of the app
+                _onItemTapped(3);
+                // Then close the drawer
+                Navigator.pushReplacementNamed(context, '/register');
+              },
+            ),
+            ListTile(
+              title: const Text('Login'),
+              leading: const Icon(Icons.login),
+              selected: _selectedIndex == 4,
+              onTap: () {
+                // Update the state of the app
+                _onItemTapped(4);
+                // Then close the drawer
+                Navigator.pushReplacementNamed(context, '/login');
+              },
+            ),
+          ],
+        ),
+      ),
+      body: widget.body,
+    );
+  }
+}

Mobile/lib/login.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:mobile/base/sidemenu.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'register.dart';
 import 'api.dart' as api;
@@ -17,7 +18,8 @@ class _LoginPageState extends State<LoginPage> {
   final passwordInput = TextEditingController();
 
   Future<void> _login() async {
-    final token = await api.request(context, api.ApiService.auth, 'POST', '/api/Users/login', {
+    final token = await api
+        .request(context, api.ApiService.auth, 'POST', '/api/Users/login', {
       'email': emailInput.text,
       'password': passwordInput.text,
     });
@@ -28,41 +30,44 @@ class _LoginPageState extends State<LoginPage> {
     prefs.setString('token', token);
 
     if (mounted) {
-      ScaffoldMessenger.of(context).showSnackBar(const SnackBar(content: Text('Successfully logged in')));
+      ScaffoldMessenger.of(context).showSnackBar(
+          const SnackBar(content: Text('Successfully logged in')));
       Navigator.pop(context);
     }
   }
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return SideMenu(
-      appBar: AppBar(
+        body: Scaffold(
-        backgroundColor: Theme.of(context).colorScheme.inversePrimary,
+            body: Center(
-        title: Text(widget.title),
+                child: Container(
-      ),
+                    constraints:
-      body: Center(
+                        const BoxConstraints(minWidth: 100, maxWidth: 400),
-        child: Container(
+                    child: Column(children: [
-          constraints: const BoxConstraints(minWidth: 100, maxWidth: 400),
+                      const SizedBox(height: 80),
-          child: Column(
+                      const Text('Email'),
-            children: [
+                      TextField(controller: emailInput),
-              const SizedBox(height: 80),
+                      const SizedBox(height: 30),
-              const Text('Email'),
+                      const Text('Password'),
-              TextField(controller: emailInput),
+                      TextField(
-              const SizedBox(height: 30),
+                          controller: passwordInput,
-              const Text('Password'),
+                          obscureText: true,
-              TextField(controller: passwordInput, obscureText: true, enableSuggestions: false, autocorrect: false),
+                          enableSuggestions: false,
-              const SizedBox(height: 30),
+                          autocorrect: false),
-              ElevatedButton(onPressed: _login, child: const Text('Log ind')),
+                      const SizedBox(height: 30),
-              const SizedBox(height: 10),
+                      ElevatedButton(
-              TextButton(
+                          onPressed: _login, child: const Text('Log ind')),
-                child: const Text('Registrer konto'),
+                      const SizedBox(height: 10),
-                onPressed: () => Navigator.pushReplacement(context, MaterialPageRoute(builder: (context) => const RegisterPage(title: 'Registrer'))),
+                      TextButton(
-              )
+                        child: const Text('Registrer konto'),
-            ]
+                        onPressed: () => Navigator.pushReplacement(
-          )
+                            context,
-        )
+                            MaterialPageRoute(
-      )
+                                builder: (context) =>
-    );
+                                    const RegisterPage(title: 'Registrer'))),
+                      )
+                    ])))));
   }
 
   @override

Mobile/lib/main.dart

@@ -2,7 +2,9 @@ import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
 import "package:latlong2/latlong.dart";
 import 'package:mobile/register.dart';
+import 'base/sidemenu.dart';
 import "login.dart";
+import 'profile.dart';
 
 void main() {
   runApp(const MyApp());
@@ -19,6 +21,15 @@ class MyApp extends StatelessWidget {
         useMaterial3: true,
       ),
       home: const MyHomePage(title: 'SkanTravels'),
+      initialRoute: '/',
+      routes: {
+        '/home': (context) => const MyHomePage(
+              title: 'SkasdanTravels',
+            ),
+        '/profile': (context) => const ProfilePage(),
+        '/login': (context) => const LoginPage(title: 'SkanTravels'),
+        '/register': (context) => const RegisterPage(title: 'SkanTravels'),
+      },
     );
   }
 }
@@ -33,128 +44,51 @@ class MyHomePage extends StatefulWidget {
 }
 
 class _MyHomePageState extends State<MyHomePage> {
-  int _selectedIndex = 0;
-
-  void _onItemTapped(int index) {
-    setState(() {
-      _selectedIndex = index;
-    });
-  }
-
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return SideMenu(
-      appBar: AppBar(
+      body: Scaffold(
-        backgroundColor: Theme.of(context).colorScheme.inversePrimary,
+        body: FlutterMap(
-        title: Text(widget.title),
+          options: const MapOptions(
-      ),
+              initialCenter: LatLng(55.9397, 9.5156), initialZoom: 7.0),
-      drawer: navigationMenu,
-      body: FlutterMap(
-        options: const MapOptions(
-            initialCenter: LatLng(55.9397, 9.5156), initialZoom: 7.0),
-        children: [
-          TileLayer(
-            urlTemplate: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
-            userAgentPackageName: 'dev.fleaflet.flutter_map.example',
-          )
-        ],
-      ),
-      floatingActionButton: Row(
-        mainAxisAlignment: MainAxisAlignment.end,
-        children: [
-          FloatingActionButton(
-            onPressed: () {
-              Navigator.push(
-                  context,
-                  MaterialPageRoute(
-                      builder: (context) => const LoginPage(title: "Login")));
-            },
-            tooltip: 'Login',
-            child: const Icon(Icons.login),
-          ),
-        ],
-      ),
-    );
-  }
-
-  Drawer get navigationMenu => Drawer(
-        child: ListView(
-          padding: EdgeInsets.zero,
           children: [
-            const DrawerHeader(
+            openStreetMapTileLayer,
-              decoration: BoxDecoration(
+            const MarkerLayer(markers: [
-                color: Colors.blue,
+              Marker(
+                point: LatLng(56.465511, 9.411366),
+                width: 60,
+                height: 100,
+                alignment: Alignment.center,
+                child: Icon(
+                  Icons.location_pin,
+                  size: 60,
+                  color: Colors.purple,
+                ),
               ),
-              child: Text('Drawer Header'),
+            ]),
-            ),
+          ],
-            ListTile(
+        ),
-              title: const Text('Home'),
+        floatingActionButton: Row(
-              leading: const Icon(Icons.home),
+          mainAxisAlignment: MainAxisAlignment.end,
-              selected: _selectedIndex == 0,
+          children: [
-              onTap: () {
+            FloatingActionButton(
-                // Update the state of the app
+              onPressed: () {
-                _onItemTapped(0);
-                // Then close the drawer
-                Navigator.pop(context);
-              },
-            ),
-            ListTile(
-              title: const Text('Favourites'),
-              leading: const Icon(Icons.star),
-              selected: _selectedIndex == 1,
-              onTap: () {
-                // Update the state of the app
-                _onItemTapped(1);
-                // Then close the drawer
-                Navigator.pop(context);
-              },
-            ),
-            ListTile(
-              title: const Text('Profile'),
-              leading: const Icon(Icons.person),
-              selected: _selectedIndex == 2,
-              onTap: () {
-                // Update the state of the app
-                _onItemTapped(2);
-                // Then close the drawer
-                Navigator.pop(context);
-              },
-            ),
-            const Divider(
-              color: Colors.grey,
-              thickness: 2,
-              indent: 40,
-            ),
-            ListTile(
-              title: const Text('Register'),
-              leading: const Icon(Icons.add_box_outlined),
-              selected: _selectedIndex == 3,
-              onTap: () {
-                // Update the state of the app
-                _onItemTapped(3);
-                // Then close the drawer
-                Navigator.push(
-                    context,
-                    MaterialPageRoute(
-                        builder: (context) =>
-                            const RegisterPage(title: "Register")));
-              },
-            ),
-            ListTile(
-              title: const Text('Login'),
-              leading: const Icon(Icons.login),
-              selected: _selectedIndex == 4,
-              onTap: () {
-                // Update the state of the app
-                _onItemTapped(4);
-                // Then close the drawer
                 Navigator.push(
                     context,
                     MaterialPageRoute(
                         builder: (context) => const LoginPage(title: "Login")));
               },
+              tooltip: 'Login',
+              child: const Icon(Icons.login),
             ),
           ],
         ),
+      ),
+    );
+  }
+
+  TileLayer get openStreetMapTileLayer => TileLayer(
+        urlTemplate: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
+        userAgentPackageName: 'dev.fleaflet.flutter_map.example',
       );
 }

Mobile/lib/profile.dart

@@ -1 +1,15 @@
+import 'package:flutter/material.dart';
+import 'base/sidemenu.dart'; // Import the base layout widget
 
+class ProfilePage extends StatelessWidget {
+  const ProfilePage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return const SideMenu(
+      body: Center(
+        child: Text('This is Page 1'),
+      ),
+    );
+  }
+}

Mobile/lib/register.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:mobile/base/sidemenu.dart';
 import 'login.dart';
 import 'api.dart' as api;
 
@@ -17,7 +18,8 @@ class _RegisterPageState extends State<RegisterPage> {
   final passwordInput = TextEditingController();
 
   Future<void> _register() async {
-    final result = await api.request(context, api.ApiService.auth, 'POST', '/api/Users', {
+    final result =
+        await api.request(context, api.ApiService.auth, 'POST', '/api/Users', {
       'username': usernameInput.text,
       'email': emailInput.text,
       'password': passwordInput.text,
@@ -26,44 +28,49 @@ class _RegisterPageState extends State<RegisterPage> {
     if (result == null) return;
 
     if (mounted) {
-      ScaffoldMessenger.of(context).showSnackBar(const SnackBar(content: Text('Successfully registered, please login')));
+      ScaffoldMessenger.of(context).showSnackBar(const SnackBar(
-      Navigator.pushReplacement(context, MaterialPageRoute(builder: (context) => const LoginPage(title: 'Log ind')));
+          content: Text('Successfully registered, please login')));
+      Navigator.pushReplacement(
+          context,
+          MaterialPageRoute(
+              builder: (context) => const LoginPage(title: 'Log ind')));
     }
   }
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return SideMenu(
-      appBar: AppBar(
+        body: Scaffold(
-        backgroundColor: Theme.of(context).colorScheme.inversePrimary,
+            body: Center(
-        title: Text(widget.title),
+                child: Container(
-      ),
+                    constraints:
-      body: Center(
+                        const BoxConstraints(minWidth: 100, maxWidth: 400),
-        child: Container(
+                    child: Column(children: [
-          constraints: const BoxConstraints(minWidth: 100, maxWidth: 400),
+                      const SizedBox(height: 80),
-          child: Column(
+                      const Text('Brugernavn'),
-            children: [
+                      TextField(controller: usernameInput),
-              const SizedBox(height: 80),
+                      const SizedBox(height: 30),
-              const Text('Brugernavn'),
+                      const Text('Email'),
-              TextField(controller: usernameInput),
+                      TextField(controller: emailInput),
-              const SizedBox(height: 30),
+                      const SizedBox(height: 30),
-              const Text('Email'),
+                      const Text('Password'),
-              TextField(controller: emailInput),
+                      TextField(
-              const SizedBox(height: 30),
+                          controller: passwordInput,
-              const Text('Password'),
+                          obscureText: true,
-              TextField(controller: passwordInput, obscureText: true, enableSuggestions: false, autocorrect: false),
+                          enableSuggestions: false,
-              const SizedBox(height: 30),
+                          autocorrect: false),
-              ElevatedButton(onPressed: _register, child: const Text('Registrer')),
+                      const SizedBox(height: 30),
-              const SizedBox(height: 10),
+                      ElevatedButton(
-              TextButton(
+                          onPressed: _register, child: const Text('Registrer')),
-                child: const Text('Log ind'),
+                      const SizedBox(height: 10),
-                onPressed: () => Navigator.pushReplacement(context, MaterialPageRoute(builder: (context) => const LoginPage(title: 'Log ind')))
+                      TextButton(
-              ),
+                          child: const Text('Log ind'),
-            ]
+                          onPressed: () => Navigator.pushReplacement(
-          )
+                              context,
-        )
+                              MaterialPageRoute(
-      )
+                                  builder: (context) =>
-    );
+                                      const LoginPage(title: 'Log ind')))),
+                    ])))));
   }
 
   @override