reorganize the profile page, move My Teams from Homepage to profile add sign out button to popup menu in homepage

2026-03-13 14:56:39 +01:00
parent 780afb0c56
commit cc7faf477b
5 changed files with 126 additions and 132 deletions
--- a/frontend_splatournament_manager/lib/pages/home_page.dart
+++ b/frontend_splatournament_manager/lib/pages/home_page.dart
@@ -3,10 +3,10 @@ import 'package:frontend_splatournament_manager/providers/tournament_provider.da
 import 'package:frontend_splatournament_manager/providers/team_provider.dart';
 import 'package:frontend_splatournament_manager/widgets/available_tournament_list.dart';
 import 'package:frontend_splatournament_manager/widgets/teams_list_widget.dart';
-import 'package:frontend_splatournament_manager/widgets/my_teams_widget.dart';
 import 'package:frontend_splatournament_manager/widgets/my_tournaments_carousel.dart';
 import 'package:frontend_splatournament_manager/pages/create_tournament_page.dart';
 import 'package:frontend_splatournament_manager/pages/create_team_page.dart';
+import 'package:frontend_splatournament_manager/providers/auth_provider.dart';
 import 'package:go_router/go_router.dart';
 import 'package:provider/provider.dart';

@@ -17,48 +17,14 @@ class HomePage extends StatefulWidget {
  State<HomePage> createState() => _HomePageState();
 }

-class _HomePageState extends State<HomePage>
-    with SingleTickerProviderStateMixin {
+class _HomePageState extends State<HomePage> {
  int _selectedIndex = 0;
-  late TabController _tabController;
-
-  @override
-  void initState() {
-    super.initState();
-    _tabController = TabController(length: 2, vsync: this);
-  }
-
-  @override
-  void dispose() {
-    _tabController.dispose();
-    super.dispose();
-  }

  @override
  Widget build(BuildContext context) {
-    final appBarForeground =
-        Theme.of(context).appBarTheme.foregroundColor ??
-        Theme.of(context).colorScheme.onSurface;
-
    return Scaffold(
      appBar: AppBar(
        title: Text(_selectedIndex == 0 ? 'Turniere' : 'Teams'),
-        bottom: _selectedIndex == 1
-            ? TabBar(
-                controller: _tabController,
-                labelColor: appBarForeground,
-                unselectedLabelColor: appBarForeground.withValues(alpha: 0.82),
-                indicatorColor: appBarForeground,
-                labelStyle: const TextStyle(fontWeight: FontWeight.w700),
-                unselectedLabelStyle: const TextStyle(
-                  fontWeight: FontWeight.w500,
-                ),
-                tabs: const [
-                  Tab(text: 'Alle Teams'),
-                  Tab(text: 'Meine Teams'),
-                ],
-              )
-            : null,
        actions: [
          IconButton(
            onPressed: () async {
@@ -91,12 +57,24 @@ class _HomePageState extends State<HomePage>
          ),
          PopupMenuButton(
            onSelected: (value) {
-              context.go("/settings");
+              if (value == 1) {
+                context.go("/settings");
+              } else if (value == 2) {
+                Provider.of<AuthProvider>(context, listen: false).logout();
+                context.go('/login');
+              }
            },
            offset: const Offset(0, 48),
            itemBuilder: (context) {
              return [
-                const PopupMenuItem(value: 1, child: Text('Einstellungen')),
+                const PopupMenuItem(value: 1, child: Text('Profil')),
+                const PopupMenuItem(
+                  value: 2,
+                  child: Text(
+                    'Abmelden',
+                    style: TextStyle(color: Colors.red),
+                  ),
+                ),
              ];
            },
          ),
@@ -112,11 +90,8 @@ class _HomePageState extends State<HomePage>
              const Expanded(child: AvailableTournamentList()),
            ],
          ),
-          // Teams View with tabs
-          TabBarView(
-            controller: _tabController,
-            children: const [TeamsListWidget(), MyTeamsWidget()],
-          ),
+          // Teams View
+          const TeamsListWidget(),
        ],
      ),
      bottomNavigationBar: BottomNavigationBar(
--- a/frontend_splatournament_manager/lib/pages/settings_page.dart
+++ b/frontend_splatournament_manager/lib/pages/settings_page.dart
@@ -1,8 +1,6 @@
 import 'package:flutter/material.dart';
+import 'package:frontend_splatournament_manager/widgets/my_teams_widget.dart';
 import 'package:frontend_splatournament_manager/widgets/theme_selector_widget.dart';
-import 'package:provider/provider.dart';
-import 'package:frontend_splatournament_manager/providers/auth_provider.dart';
-import 'package:go_router/go_router.dart';

 import '../widgets/profile_widget.dart';

@@ -17,28 +15,23 @@ class _SettingsPageState extends State<SettingsPage> {
  @override
  Widget build(BuildContext context) {
    return Scaffold(
-      appBar: AppBar(title: const Text('Einstellungen')),
+      appBar: AppBar(title: const Text('Profil')),
      body: Column(
        children: [
          const SizedBox(height: 24),
          const ProfileWidget(),
-          Column(
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              ThemeSelectorWidget(),
-              ListTile(
-                leading: const Icon(Icons.logout, color: Colors.red),
-                title: const Text(
-                  'Abmelden',
-                  style: TextStyle(color: Colors.red),
-                ),
-                onTap: () {
-                  Provider.of<AuthProvider>(context, listen: false).logout();
-                  context.go('/login');
-                },
+          ThemeSelectorWidget(),
+          const Padding(
+            padding: EdgeInsets.fromLTRB(16, 16, 16, 4),
+            child: Align(
+              alignment: Alignment.centerLeft,
+              child: Text(
+                'Meine Teams',
+                style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
              ),
-            ],
+            ),
          ),
+          const Expanded(child: MyTeamsWidget()),
        ],
      ),
    );
--- a/frontend_splatournament_manager/lib/providers/team_provider.dart
+++ b/frontend_splatournament_manager/lib/providers/team_provider.dart
@@ -6,9 +6,12 @@ class TeamProvider extends ChangeNotifier {
  final TeamService _teamService = TeamService();

  List<Team> _teams = [];
+  List<Team> _userTeams = [];
  Future<List<Team>>? _initialLoadFuture;
+  Future<List<Team>>? _userTeamsFuture;

  List<Team> get teams => _teams;
+  List<Team> get userTeams => _userTeams;

  Future<List<Team>> fetchAllTeams() async {
    _teams = await _teamService.getAllTeams();
@@ -26,6 +29,17 @@ class TeamProvider extends ChangeNotifier {
    return _initialLoadFuture!;
  }

+  Future<List<Team>> fetchUserTeams() async {
+    _userTeams = await _teamService.getUserTeams();
+    notifyListeners();
+    return _userTeams;
+  }
+
+  Future<List<Team>> ensureUserTeamsLoaded() {
+    _userTeamsFuture ??= fetchUserTeams();
+    return _userTeamsFuture!;
+  }
+
  Future<Team> createTeam({
    required String name,
    required String tag,
@@ -77,11 +91,19 @@ class TeamProvider extends ChangeNotifier {

  Future<void> joinTeam(int teamId) async {
    await _teamService.joinTeam(teamId);
-    notifyListeners();
+    await _refreshMembership();
  }

  Future<void> leaveTeam(int teamId) async {
    await _teamService.leaveTeam(teamId);
+    await _refreshMembership();
+  }
+
+  Future<void> _refreshMembership() async {
+    await Future.wait([
+      _teamService.getAllTeams().then((t) => _teams = t),
+      _teamService.getUserTeams().then((t) => _userTeams = t),
+    ]);
    notifyListeners();
  }

--- a/frontend_splatournament_manager/lib/widgets/my_teams_widget.dart
+++ b/frontend_splatournament_manager/lib/widgets/my_teams_widget.dart
@@ -3,71 +3,57 @@ import 'package:frontend_splatournament_manager/models/team.dart';
 import 'package:frontend_splatournament_manager/providers/team_provider.dart';
 import 'package:provider/provider.dart';

-class MyTeamsWidget extends StatefulWidget {
+class MyTeamsWidget extends StatelessWidget {
  const MyTeamsWidget({super.key});

-  @override
-  State<MyTeamsWidget> createState() => _MyTeamsWidgetState();
-}
-
-class _MyTeamsWidgetState extends State<MyTeamsWidget> {
-  late Future<List<Team>> _myTeamsFuture;
-
-  @override
-  void initState() {
-    super.initState();
-    _loadMyTeams();
-  }
-
-  void _loadMyTeams() {
-    _myTeamsFuture = Provider.of<TeamProvider>(
-      context,
-      listen: false,
-    ).getUserTeams();
-  }
-
  @override
  Widget build(BuildContext context) {
-    return FutureBuilder<List<Team>>(
-      future: _myTeamsFuture,
-      builder: (context, snapshot) {
-        if (snapshot.connectionState == ConnectionState.waiting) {
-          return const Center(child: CircularProgressIndicator());
-        }
+    return Consumer<TeamProvider>(
+      builder: (context, provider, _) {
+        return FutureBuilder<List<Team>>(
+          future: provider.ensureUserTeamsLoaded(),
+          builder: (context, snapshot) {
+            final teams = provider.userTeams;

-        if (snapshot.hasError) {
-          return Center(
-            child: Text(
-              'Fehler: ${snapshot.error.toString().replaceFirst('Exception: ', '')}',
-            ),
-          );
-        }
+            if (snapshot.connectionState == ConnectionState.waiting &&
+                teams.isEmpty) {
+              return const Center(child: CircularProgressIndicator());
+            }

-        final teams = snapshot.data ?? [];
-        if (teams.isEmpty) {
-          return const Center(
-            child: Text(
-              'Du bist noch in keinem Team.\nTritt einem Team im Tab Alle Teams bei.',
-            ),
-          );
-        }
+            if (snapshot.hasError && teams.isEmpty) {
+              return Center(
+                child: Text(
+                  "Fehler: ${snapshot.error.toString().replaceFirst("Exception: ", "")}",
+                ),
+              );
+            }

-        return ListView.builder(
-          padding: const EdgeInsets.all(16),
-          itemCount: teams.length,
-          itemBuilder: (context, index) => _buildTeamCard(teams[index]),
+            if (teams.isEmpty) {
+              return const Center(
+                child: Text(
+                  'Du bist noch in keinem Team.\nTritt einem Team unter Teams bei.',
+                ),
+              );
+            }
+
+            return ListView.builder(
+              padding: const EdgeInsets.all(16),
+              itemCount: teams.length,
+              itemBuilder: (context, index) =>
+                  _buildTeamCard(context, teams[index]),
+            );
+          },
        );
      },
    );
  }

-  Widget _buildTeamCard(Team team) {
+  Widget _buildTeamCard(BuildContext context, Team team) {
    final memberCountText = team.memberCount != null
-        ? '${team.memberCount}/4 Mitglieder'
-        : 'Keine Mitglieder';
-    final description = team.description.isEmpty
-        ? 'Keine Beschreibung'
-        : team.description;
+        ? "${team.memberCount}/4 Mitglieder"
+        : "Keine Mitglieder";
+    final description =
+        team.description.isEmpty ? "Keine Beschreibung" : team.description;

    return Card(
      margin: const EdgeInsets.only(bottom: 12),
@@ -80,50 +66,47 @@ class _MyTeamsWidgetState extends State<MyTeamsWidget> {
        ),
        trailing: IconButton(
          icon: const Icon(Icons.logout, color: Colors.red),
-          onPressed: () => _leaveTeam(team),
+          onPressed: () => _leaveTeam(context, team),
        ),
      ),
    );
  }

-  Future<void> _leaveTeam(Team team) async {
+  Future<void> _leaveTeam(BuildContext context, Team team) async {
    final confirmed = await showDialog<bool>(
      context: context,
      builder: (context) => AlertDialog(
-        title: const Text('Team verlassen?'),
+        title: const Text("Team verlassen?"),
        content: Text('Soll "${team.name}" verlassen werden?'),
        actions: [
          TextButton(
            onPressed: () => Navigator.pop(context, false),
-            child: const Text('Abbrechen'),
+            child: const Text("Abbrechen"),
          ),
          TextButton(
            onPressed: () => Navigator.pop(context, true),
-            child: const Text('Verlassen', style: TextStyle(color: Colors.red)),
+            child: const Text("Verlassen", style: TextStyle(color: Colors.red)),
          ),
        ],
      ),
    );

-    if (confirmed == true && mounted) {
+    if (confirmed == true && context.mounted) {
      try {
-        await Provider.of<TeamProvider>(
-          context,
-          listen: false,
-        ).leaveTeam(team.id);
-        if (mounted) {
+        await Provider.of<TeamProvider>(context, listen: false).leaveTeam(
+          team.id,
+        );
+        if (context.mounted) {
          ScaffoldMessenger.of(
            context,
-          ).showSnackBar(const SnackBar(content: Text('Team verlassen')));
-          _loadMyTeams();
-          setState(() {});
+          ).showSnackBar(const SnackBar(content: Text("Team verlassen")));
        }
      } catch (e) {
-        if (mounted) {
+        if (context.mounted) {
          ScaffoldMessenger.of(context).showSnackBar(
            SnackBar(
              content: Text(
-                'Fehler: ${e.toString().replaceFirst('Exception: ', '')}',
+                "Fehler: ${e.toString().replaceFirst("Exception: ", "")}",
              ),
            ),
          );