add support for badges and notifications, adjust nav pages

lib/components/calculator/route_summary_widget.dart

@@ -36,16 +36,20 @@ class RouteDetailsView extends StatelessWidget {
   final List<String> route;
   final List<double> costs;
   final VoidCallback onBack;
+  final Set<String> routingPoints;
 
   const RouteDetailsView({
     super.key,
     required this.route,
     required this.costs,
     required this.onBack,
+    this.routingPoints = const {},
   });
 
   @override
   Widget build(BuildContext context) {
+    final highlightColor = Theme.of(context).colorScheme.primary;
+    final mutedColor = Theme.of(context).colorScheme.outlineVariant;
     return Column(
       children: [
         Align(
@@ -60,8 +64,20 @@ class RouteDetailsView extends StatelessWidget {
           child: ListView.builder(
             itemCount: route.length,
             itemBuilder: (context, index) {
+              final label = route[index];
+              final isRoutingPoint = routingPoints.contains(label);
               return ListTile(
-                title: Text(route[index]),
+                leading: Icon(
+                  Icons.circle,
+                  size: 12,
+                  color: isRoutingPoint ? highlightColor : mutedColor,
+                ),
+                title: Text(
+                  label,
+                  style: isRoutingPoint
+                      ? TextStyle(color: highlightColor, fontWeight: FontWeight.w600)
+                      : null,
+                ),
                 trailing: Text("${costs[index].toStringAsFixed(2)} mi"),
               );
             },

lib/components/dashboard/latest_loco_changes_panel.dart

@@ -1,9 +1,13 @@
 import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
+import 'package:mileograph_flutter/objects/objects.dart';
 import 'package:mileograph_flutter/services/data_service.dart';
 import 'package:provider/provider.dart';
 
 class LatestLocoChangesPanel extends StatefulWidget {
-  const LatestLocoChangesPanel({super.key});
+  const LatestLocoChangesPanel({super.key, this.expanded = false});
+
+  final bool expanded;
 
   @override
   State<LatestLocoChangesPanel> createState() => _LatestLocoChangesPanelState();
@@ -11,6 +15,9 @@ class LatestLocoChangesPanel extends StatefulWidget {
 
 class _LatestLocoChangesPanelState extends State<LatestLocoChangesPanel> {
   late final ScrollController _controller;
+  final Set<String> _collapsedDates = {};
+  final Set<String> _collapsedClasses = {};
+  final Set<String> _collapsedLocos = {};
 
   @override
   void initState() {
@@ -35,11 +42,11 @@ class _LatestLocoChangesPanelState extends State<LatestLocoChangesPanel> {
       clipBehavior: Clip.antiAlias,
       child: Padding(
         padding: const EdgeInsets.all(16),
-        child: Column(
+          child: Column(
-          crossAxisAlignment: CrossAxisAlignment.stretch,
+            crossAxisAlignment: CrossAxisAlignment.stretch,
-          children: [
+            children: [
-            Row(
+              Row(
-              children: [
+                children: [
                 const Icon(Icons.bolt, size: 20),
                 const SizedBox(width: 8),
                 Expanded(
@@ -73,52 +80,419 @@ class _LatestLocoChangesPanelState extends State<LatestLocoChangesPanel> {
                 ),
               )
             else
-              SizedBox(
+              Column(
-                height: 260,
+                crossAxisAlignment: CrossAxisAlignment.stretch,
-                child: Scrollbar(
+                children: [
-                  controller: _controller,
+                  _buildChangesList(changes, textTheme),
-                  child: ListView.separated(
+                  const SizedBox(height: 8),
-                    controller: _controller,
+                  Align(
-                    itemCount: changes.length,
+                    alignment: Alignment.centerLeft,
-                    separatorBuilder: (context, index) =>
+                    child: OutlinedButton.icon(
-                        const Divider(height: 1),
+                      onPressed: isLoading ? null : _loadMore,
-                    itemBuilder: (context, index) {
+                      icon: isLoading
-                      final change = changes[index];
+                          ? const SizedBox(
-                      return ListTile(
+                              height: 14,
-                        dense: true,
+                              width: 14,
-                        contentPadding: EdgeInsets.zero,
+                              child: CircularProgressIndicator(strokeWidth: 2),
-                        title: Text(
+                            )
-                          change.locoLabel,
+                          : const Icon(Icons.expand_more),
-                          style: textTheme.titleSmall?.copyWith(
+                      label: Text(isLoading ? 'Loading...' : 'Show more'),
-                            fontWeight: FontWeight.w600,
+                    ),
-                          ),
-                        ),
-                        subtitle: Column(
-                          crossAxisAlignment: CrossAxisAlignment.start,
-                          children: [
-                            Text('${change.changeLabel}: ${change.valueLabel}'),
-                            Text(
-                              change.approvedDateLabel,
-                              style: textTheme.labelSmall?.copyWith(
-                                color: textTheme.bodySmall?.color?.withValues(alpha: 0.7),
-                              ),
-                            ),
-                          ],
-                        ),
-                        trailing: change.approvedBy.isEmpty
-                            ? null
-                            : Text(
-                                change.approvedBy,
-                                style: textTheme.labelSmall,
-                              ),
-                      );
-                    },
                   ),
-                ),
+                ],
               ),
           ],
         ),
       ),
     );
   }
+
+  Widget _buildChangesList(List<LocoChange> changes, TextTheme textTheme) {
+    final grouped = _groupChanges(changes);
+    // Start with all locos collapsed by default.
+    if (_collapsedLocos.isEmpty) {
+      for (final group in grouped) {
+        for (final classGroup in group.classGroups) {
+          for (final locoGroup in classGroup.locoGroups) {
+            _collapsedLocos.add(
+              _locoKey(group.dateLabel, classGroup.classLabel, locoGroup.locoLabel),
+            );
+          }
+        }
+      }
+    }
+
+    final listView = ListView.separated(
+      controller: null,
+      shrinkWrap: true,
+      physics: const NeverScrollableScrollPhysics(),
+      itemBuilder: (context, groupIndex) {
+        final group = grouped[groupIndex];
+        final dateCollapsed = _collapsedDates.contains(group.dateLabel);
+        return Column(
+          crossAxisAlignment: CrossAxisAlignment.stretch,
+          children: [
+            Padding(
+              padding: const EdgeInsets.symmetric(vertical: 6.0),
+              child: Row(
+                children: [
+                  IconButton(
+                    iconSize: 18,
+                    padding: EdgeInsets.zero,
+                    constraints: const BoxConstraints(),
+                    onPressed: () => _toggleDate(group.dateLabel),
+                    icon: Icon(
+                      dateCollapsed ? Icons.chevron_right : Icons.expand_more,
+                    ),
+                  ),
+                  const SizedBox(width: 6),
+                  Expanded(
+                    child: Text(
+                      group.dateLabel,
+                      style: textTheme.labelLarge?.copyWith(
+                        fontWeight: FontWeight.w700,
+                      ),
+                    ),
+                  ),
+                  TextButton(
+                    onPressed: () => _collapseDateChildren(
+                      group.dateLabel,
+                      group.classGroups,
+                      collapse: !_isDateFullyCollapsed(group),
+                    ),
+                    child: Text(
+                      _isDateFullyCollapsed(group) ? 'Expand all' : 'Collapse all',
+                    ),
+                  ),
+                ],
+              ),
+            ),
+            if (!dateCollapsed)
+              ...group.classGroups.map(
+                (classGroup) {
+                  final classKey = _classKey(group.dateLabel, classGroup.classLabel);
+                  final classCollapsed = _collapsedClasses.contains(classKey);
+                  return Padding(
+                    padding: const EdgeInsets.only(bottom: 8.0, left: 12.0),
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Row(
+                          children: [
+                            IconButton(
+                              iconSize: 18,
+                              padding: EdgeInsets.zero,
+                              constraints: const BoxConstraints(),
+                              onPressed: () => _toggleClass(classKey),
+                              icon: Icon(
+                                classCollapsed
+                                    ? Icons.chevron_right
+                                    : Icons.expand_more,
+                              ),
+                            ),
+                            const SizedBox(width: 4),
+                            Expanded(
+                              child: Text(
+                                classGroup.classLabel,
+                                style: textTheme.titleSmall?.copyWith(
+                                  fontWeight: FontWeight.w700,
+                                ),
+                              ),
+                            ),
+                            TextButton(
+                              onPressed: () => _collapseClassChildren(
+                                group.dateLabel,
+                                classGroup.classLabel,
+                                classGroup.locoGroups,
+                                collapse:
+                                    !_isClassFullyCollapsed(classKey, classGroup, group.dateLabel),
+                              ),
+                              child: Text(
+                                _isClassFullyCollapsed(classKey, classGroup, group.dateLabel)
+                                    ? 'Expand all'
+                                    : 'Collapse all',
+                              ),
+                            ),
+                          ],
+                        ),
+                        if (!classCollapsed)
+                          ...classGroup.locoGroups.map(
+                            (locoGroup) {
+                              final locoKey =
+                                  _locoKey(group.dateLabel, classGroup.classLabel, locoGroup.locoLabel);
+                              final locoCollapsed = _collapsedLocos.contains(locoKey);
+                              return Padding(
+                                padding:
+                                    const EdgeInsets.only(bottom: 4.0, left: 22.0),
+                                child: Column(
+                                  crossAxisAlignment: CrossAxisAlignment.start,
+                                  children: [
+                                    Row(
+                                      children: [
+                                        IconButton(
+                                          iconSize: 18,
+                                          padding: EdgeInsets.zero,
+                                          constraints: const BoxConstraints(),
+                                          onPressed: () => _toggleLoco(locoKey),
+                                          icon: Icon(
+                                            locoCollapsed
+                                                ? Icons.chevron_right
+                                                : Icons.expand_more,
+                                          ),
+                                        ),
+                                        const SizedBox(width: 4),
+                                        Text(
+                                          locoGroup.locoLabel,
+                                          style: textTheme.bodyMedium?.copyWith(
+                                            fontWeight: FontWeight.w700,
+                                          ),
+                                        ),
+                                      ],
+                                    ),
+                                    if (!locoCollapsed) ...[
+                                      const SizedBox(height: 2),
+                                      ...locoGroup.changes.map(
+                                        (change) => ListTile(
+                                          dense: true,
+                                          visualDensity: const VisualDensity(
+                                            horizontal: 0,
+                                            vertical: -3,
+                                          ),
+                                          minVerticalPadding: 0,
+                                          contentPadding: EdgeInsets.zero,
+                                          title: Text(
+                                            '${change.changeLabel}: ${change.valueLabel}',
+                                            style: textTheme.bodyMedium,
+                                          ),
+                                          trailing: change.approvedBy.isEmpty
+                                              ? null
+                                              : Text(
+                                                  change.approvedBy,
+                                                  style: textTheme.labelSmall,
+                                                ),
+                                        ),
+                                      ),
+                                    ],
+                                  ],
+                                ),
+                              );
+                            },
+                          ),
+                      ],
+                    ),
+                  );
+                },
+              ),
+          ],
+        );
+      },
+      separatorBuilder: (_, __) => const Divider(height: 8),
+      itemCount: grouped.length,
+    );
+
+    if (widget.expanded) {
+      return listView;
+    }
+
+    return listView;
+  }
+
+  void _toggleDate(String date) {
+    setState(() {
+      if (_collapsedDates.contains(date)) {
+        _collapsedDates.remove(date);
+      } else {
+        _collapsedDates.add(date);
+      }
+    });
+  }
+
+  void _toggleClass(String key) {
+    setState(() {
+      if (_collapsedClasses.contains(key)) {
+        _collapsedClasses.remove(key);
+      } else {
+        _collapsedClasses.add(key);
+      }
+    });
+  }
+
+  void _toggleLoco(String key) {
+    setState(() {
+      if (_collapsedLocos.contains(key)) {
+        _collapsedLocos.remove(key);
+      } else {
+        _collapsedLocos.add(key);
+      }
+    });
+  }
+
+  void _collapseDateChildren(
+    String date,
+    List<_ClassGroup> classGroups, {
+    required bool collapse,
+  }) {
+    setState(() {
+      for (final classGroup in classGroups) {
+        final classKey = _classKey(date, classGroup.classLabel);
+        if (collapse) {
+          _collapsedClasses.add(classKey);
+        } else {
+          _collapsedClasses.remove(classKey);
+        }
+        for (final locoGroup in classGroup.locoGroups) {
+          final locoKey = _locoKey(date, classGroup.classLabel, locoGroup.locoLabel);
+          if (collapse) {
+            _collapsedLocos.add(locoKey);
+          } else {
+            _collapsedLocos.remove(locoKey);
+          }
+        }
+      }
+    });
+  }
+
+  void _collapseClassChildren(
+    String date,
+    String classLabel,
+    List<_LocoGroup> locos, {
+    required bool collapse,
+  }) {
+    setState(() {
+      final classKey = _classKey(date, classLabel);
+      if (collapse) {
+        _collapsedClasses.add(classKey);
+      } else {
+        _collapsedClasses.remove(classKey);
+      }
+      for (final locoGroup in locos) {
+        final locoKey = _locoKey(date, classLabel, locoGroup.locoLabel);
+        if (collapse) {
+          _collapsedLocos.add(locoKey);
+        } else {
+          _collapsedLocos.remove(locoKey);
+        }
+      }
+    });
+  }
+
+  bool _isDateFullyCollapsed(_ChangeGroup group) {
+    for (final classGroup in group.classGroups) {
+      final classKey = _classKey(group.dateLabel, classGroup.classLabel);
+      if (!_collapsedClasses.contains(classKey)) return false;
+      for (final loco in classGroup.locoGroups) {
+        final locoKey = _locoKey(group.dateLabel, classGroup.classLabel, loco.locoLabel);
+        if (!_collapsedLocos.contains(locoKey)) return false;
+      }
+    }
+    return true;
+  }
+
+  bool _isClassFullyCollapsed(String classKey, _ClassGroup classGroup, String date) {
+    if (!_collapsedClasses.contains(classKey)) return false;
+    for (final loco in classGroup.locoGroups) {
+      final locoKey = _locoKey(date, classGroup.classLabel, loco.locoLabel);
+      if (!_collapsedLocos.contains(locoKey)) return false;
+    }
+    return true;
+  }
+
+  String _classKey(String date, String classLabel) => '$date|$classLabel';
+  String _locoKey(String date, String classLabel, String locoLabel) =>
+      '$date|$classLabel|$locoLabel';
+
+  List<_ChangeGroup> _groupChanges(List<LocoChange> changes) {
+    final dateFormat = DateFormat('yyyy-MM-dd');
+    final Map<String, Map<String, Map<String, List<LocoChange>>>> grouped = {};
+
+    final filtered = changes.where((change) {
+      final code = change.attrCode.toLowerCase();
+      return code != 'build_prec' && code != 'operational' && code != 'gettable';
+    });
+
+    for (final change in filtered) {
+      final date = change.approvedAt ?? change.validFrom;
+      final dateKey = date != null ? dateFormat.format(date) : 'Unknown date';
+      final classKey = change.locoClass.isNotEmpty
+          ? change.locoClass
+          : 'Unknown class';
+      final locoKey = _locoLabel(change);
+      grouped.putIfAbsent(dateKey, () => {});
+      grouped[dateKey]!.putIfAbsent(classKey, () => {});
+      grouped[dateKey]![classKey]!.putIfAbsent(locoKey, () => []);
+      grouped[dateKey]![classKey]![locoKey]!.add(change);
+    }
+
+    final sortedDates = grouped.keys.toList()
+      ..sort((a, b) {
+        if (a == 'Unknown date') return 1;
+        if (b == 'Unknown date') return -1;
+        return b.compareTo(a); // newest first
+      });
+
+    return sortedDates
+        .map(
+          (dateKey) => _ChangeGroup(
+            dateLabel: dateKey,
+            classGroups: grouped[dateKey]!.entries
+                .map(
+                  (classEntry) => _ClassGroup(
+                    classLabel: classEntry.key,
+                    locoGroups: classEntry.value.entries
+                        .map(
+                          (locoEntry) => _LocoGroup(
+                            locoLabel: locoEntry.key,
+                            changes: locoEntry.value
+                              ..sort(
+                                (a, b) => (b.approvedAt ?? b.validFrom ?? DateTime(0))
+                                    .compareTo(a.approvedAt ?? a.validFrom ?? DateTime(0)),
+                              ),
+                          ),
+                        )
+                        .toList(),
+                  ),
+                )
+                .toList(),
+          ),
+        )
+        .toList();
+  }
+
+  Future<void> _loadMore() async {
+    final data = context.read<DataService>();
+    await data.fetchLatestLocoChanges(
+      offset: data.latestLocoChanges.length,
+      append: true,
+    );
+  }
+}
+
+class _ChangeGroup {
+  final String dateLabel;
+  final List<_ClassGroup> classGroups;
+
+  _ChangeGroup({required this.dateLabel, required this.classGroups});
+}
+
+class _LocoGroup {
+  final String locoLabel;
+  final List<LocoChange> changes;
+
+  _LocoGroup({required this.locoLabel, required this.changes});
+}
+
+class _ClassGroup {
+  final String classLabel;
+  final List<_LocoGroup> locoGroups;
+
+  _ClassGroup({required this.classLabel, required this.locoGroups});
+}
+
+String _locoLabel(LocoChange change) {
+  final number = change.locoNumber.trim();
+  final name = change.locoName.trim();
+  if (number.isNotEmpty && name.isNotEmpty) return '$number — $name';
+  if (number.isNotEmpty) return number;
+  if (name.isNotEmpty) return name;
+  return 'Loco ${change.locoId}';
 }

lib/components/legs/leg_card.dart

@@ -3,8 +3,10 @@ import 'dart:convert';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:mileograph_flutter/objects/objects.dart';
+import 'package:mileograph_flutter/services/data_service.dart';
+import 'package:provider/provider.dart';
 
-class LegCard extends StatelessWidget {
+class LegCard extends StatefulWidget {
   const LegCard({
     super.key,
     required this.leg,
@@ -16,30 +18,106 @@ class LegCard extends StatelessWidget {
   final bool showEditButton;
   final bool showDate;
 
+  @override
+  State<LegCard> createState() => _LegCardState();
+}
+
+class _LegCardState extends State<LegCard> {
+  bool _expanded = false;
+
   @override
   Widget build(BuildContext context) {
+    final leg = widget.leg;
     final routeSegments = _parseRouteSegments(leg.route);
     final textTheme = Theme.of(context).textTheme;
     return Card(
       child: ExpansionTile(
+        onExpansionChanged: (v) => setState(() => _expanded = v),
         tilePadding: const EdgeInsets.symmetric(horizontal: 12, vertical: 4),
         leading: const Icon(Icons.train),
-        title: Text('${leg.start} → ${leg.end}'),
+        title: LayoutBuilder(
-        subtitle: Column(
+          builder: (context, constraints) {
-          crossAxisAlignment: CrossAxisAlignment.start,
+            final isWide = constraints.maxWidth > 520;
-          children: [
+            final routeText = Text('${leg.start} → ${leg.end}');
-            if (showDate) Text(_formatDateTime(leg.beginTime)),
+            final timeText =
-            if (leg.headcode.isNotEmpty)
+                Text(_formatDateTime(leg.beginTime, includeDate: widget.showDate));
-              Text(
+            if (!isWide) {
-                'Headcode: ${leg.headcode}',
+              return routeText;
-                style: textTheme.labelSmall,
+            }
-              ),
+            return Row(
-            if (leg.network.isNotEmpty)
+              children: [
-              Text(
+                timeText,
-                leg.network,
+                const SizedBox(width: 6),
-                style: textTheme.labelSmall,
+                const Text('·'),
-              ),
+                const SizedBox(width: 6),
-          ],
+                Expanded(child: routeText),
+              ],
+            );
+          },
+        ),
+        subtitle: LayoutBuilder(
+          builder: (context, constraints) {
+            final isWide = constraints.maxWidth > 520;
+            final timeWidget =
+                Text(_formatDateTime(leg.beginTime, includeDate: widget.showDate));
+            final tractionWrap = !_expanded && leg.locos.isNotEmpty
+                ? Wrap(
+                    spacing: 8,
+                    runSpacing: 4,
+                    children: leg.locos.map((loco) {
+                      final iconColor = loco.powering
+                          ? Theme.of(context).colorScheme.primary
+                          : Theme.of(context).hintColor;
+                      final label = '${loco.locoClass} ${loco.number}'.trim();
+                      return Row(
+                        mainAxisSize: MainAxisSize.min,
+                        children: [
+                          Icon(Icons.train, size: 14, color: iconColor),
+                          const SizedBox(width: 4),
+                          Text(
+                            label.isEmpty ? 'Loco ${loco.id}' : label,
+                            style: textTheme.labelSmall,
+                          ),
+                        ],
+                      );
+                    }).toList(),
+                  )
+                : null;
+
+            final children = <Widget>[];
+            if (isWide) {
+              if (tractionWrap != null) {
+                children.add(tractionWrap);
+              }
+            } else {
+              children.add(timeWidget);
+              if (tractionWrap != null) {
+                children.add(const SizedBox(height: 4));
+                children.add(tractionWrap);
+              }
+            }
+            if (leg.headcode.isNotEmpty) {
+              children.add(
+                Text(
+                  'Headcode: ${leg.headcode}',
+                  style: textTheme.labelSmall,
+                ),
+              );
+            }
+            if (leg.network.isNotEmpty) {
+              children.add(
+                Text(
+                  leg.network,
+                  style: textTheme.labelSmall,
+                ),
+              );
+            }
+
+            return Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: children,
+            );
+          },
         ),
         trailing: Row(
           mainAxisSize: MainAxisSize.min,
@@ -66,7 +144,7 @@ class LegCard extends StatelessWidget {
                 ],
               ],
             ),
-            if (showEditButton) ...[
+            if (widget.showEditButton) ...[
               const SizedBox(width: 8),
               IconButton(
                 tooltip: 'Edit entry',
@@ -76,6 +154,18 @@ class LegCard extends StatelessWidget {
                 constraints: const BoxConstraints(minWidth: 32, minHeight: 32),
                 onPressed: () => context.push('/legs/edit/${leg.id}'),
               ),
+              if (_expanded) ...[
+                const SizedBox(width: 4),
+                IconButton(
+                  tooltip: 'Delete entry',
+                  icon: const Icon(Icons.delete_outline),
+                  color: Theme.of(context).colorScheme.error,
+                  visualDensity: VisualDensity.compact,
+                  padding: EdgeInsets.zero,
+                  constraints: const BoxConstraints(minWidth: 32, minHeight: 32),
+                  onPressed: () => _confirmDelete(context, leg.id),
+                ),
+              ],
             ],
           ],
         ),
@@ -114,15 +204,52 @@ class LegCard extends StatelessWidget {
     );
   }
 
+  Future<void> _confirmDelete(BuildContext context, int legId) async {
+    final confirmed = await showDialog<bool>(
+      context: context,
+      builder: (ctx) => AlertDialog(
+        title: const Text('Delete entry?'),
+        content: const Text('Are you sure you want to delete this entry?'),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.of(ctx).pop(false),
+            child: const Text('Cancel'),
+          ),
+          FilledButton(
+            onPressed: () => Navigator.of(ctx).pop(true),
+            child: const Text('Delete'),
+          ),
+        ],
+      ),
+    );
+    if (confirmed != true) return;
+
+    final data = context.read<DataService>();
+    final messenger = ScaffoldMessenger.of(context);
+    try {
+      await data.api.delete('/legs/delete?leg_id=$legId');
+      await data.refreshLegs();
+      messenger.showSnackBar(const SnackBar(content: Text('Entry deleted')));
+    } catch (e) {
+      messenger.showSnackBar(
+        SnackBar(content: Text('Failed to delete entry: $e')),
+      );
+    }
+  }
+
   String _formatDate(DateTime? date) {
     if (date == null) return '';
     return '${date.year.toString().padLeft(4, '0')}-${date.month.toString().padLeft(2, '0')}-${date.day.toString().padLeft(2, '0')}';
   }
 
-  String _formatDateTime(DateTime date) {
+  String _formatTime(DateTime date) {
+    return '${date.hour.toString().padLeft(2, '0')}:${date.minute.toString().padLeft(2, '0')}';
+  }
+
+  String _formatDateTime(DateTime date, {bool includeDate = true}) {
+    final timeStr = _formatTime(date);
+    if (!includeDate) return timeStr;
     final dateStr = _formatDate(date);
-    final timeStr =
-        '${date.hour.toString().padLeft(2, '0')}:${date.minute.toString().padLeft(2, '0')}';
     return '$dateStr · $timeStr';
   }
 

lib/components/login/login.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:mileograph_flutter/services/authservice.dart';
+import 'package:mileograph_flutter/components/pages/settings.dart';
 import 'package:provider/provider.dart';
 
 class LoginScreen extends StatefulWidget {
@@ -26,7 +27,7 @@ class _LoginScreenState extends State<LoginScreen> {
       if (!valid) return;
       await auth.tryRestoreSession();
       if (!mounted) return;
-      context.go('/');
+      context.go('/dashboard');
     } finally {
       if (mounted) setState(() => _checkingSession = false);
     }
@@ -85,7 +86,14 @@ class _LoginScreenState extends State<LoginScreen> {
               IconButton(
                 icon: const Icon(Icons.settings, color: Colors.grey),
                 tooltip: 'Settings',
-                onPressed: () => context.go('/settings'),
+                onPressed: () {
+                  Navigator.of(context).push(
+                    MaterialPageRoute(
+                      fullscreenDialog: true,
+                      builder: (_) => const SettingsPage(),
+                    ),
+                  );
+                },
               ),
             ],
           ),
@@ -179,6 +187,7 @@ class _LoginPanelContentState extends State<LoginPanelContent> {
       setState(() {
         _loggingIn = false;
       });
+      context.go('/dashboard');
     } catch (e) {
       if (!mounted) return;
       setState(() {

lib/components/pages/calculator_details.dart

@@ -39,9 +39,9 @@ class CalculatorDetailsPage extends StatelessWidget {
       child: RouteDetailsView(
         route: parsed.calculatedRoute,
         costs: parsed.costs,
+        routingPoints: parsed.inputRoute.toSet(),
         onBack: () => context.pop(),
       ),
     );
   }
 }
-

lib/components/pages/dashboard.dart

@@ -232,6 +232,8 @@ class _DashboardState extends State<Dashboard> {
                 _buildOnThisDayCard(context, data),
                 const SizedBox(height: 16),
                 _buildTripsCard(context, data),
+                const SizedBox(height: 16),
+                const LatestLocoChangesPanel(expanded: true),
               ],
             ),
           ),
@@ -244,8 +246,6 @@ class _DashboardState extends State<Dashboard> {
                 TopTractionPanel(),
                 SizedBox(height: 16),
                 LeaderboardPanel(),
-                SizedBox(height: 16),
-                LatestLocoChangesPanel(),
               ],
             ),
           ),
@@ -509,7 +509,7 @@ class _DashboardState extends State<Dashboard> {
       icon: Icons.bookmark,
       title: 'Trips',
       action: TextButton(
-        onPressed: () => context.push('/trips'),
+        onPressed: () => context.push('/logbook/trips'),
         child: const Text('View all'),
       ),
       child: trips.isEmpty

lib/components/pages/loco_timeline.dart

@@ -36,6 +36,21 @@ class _LocoTimelinePageState extends State<LocoTimelinePage> {
     WidgetsBinding.instance.addPostFrameCallback((_) => _load());
   }
 
+  dynamic _normalizeFieldValue(_FieldEntry field) {
+    final name = field.field.name.toLowerCase();
+    final val = field.value;
+    if (name == 'max_speed') {
+      final numVal = val is num ? val.toDouble() : double.tryParse('$val');
+      if (numVal == null) return val;
+      final unit = (field.unit ?? 'kph').toLowerCase();
+      if (unit == 'mph') {
+        return numVal * 1.60934;
+      }
+      return numVal;
+    }
+    return val;
+  }
+
   @override
   void dispose() {
     _disposeDrafts(_draftEvents);
@@ -57,7 +72,7 @@ class _LocoTimelinePageState extends State<LocoTimelinePage> {
   String? _eventDateForEntry(LocoAttrVersion entry) {
     final masked = entry.maskedValidFrom?.trim();
     if (masked != null && masked.isNotEmpty) return masked;
-    final from = entry.validFrom ?? entry.txnFrom;
+    final from = entry.validFrom;
     if (from == null) return null;
     return DateFormat('yyyy-MM-dd').format(from);
   }
@@ -115,7 +130,8 @@ class _LocoTimelinePageState extends State<LocoTimelinePage> {
     draft.details = '';
     draft.fields.add(
       _FieldEntry(field: field)
-        ..value = _valueForEntry(entry),
+        ..value = _valueForEntry(entry)
+        ..unit = _guessUnit(field, entry.valueLabel),
     );
 
     setState(() {
@@ -123,6 +139,16 @@ class _LocoTimelinePageState extends State<LocoTimelinePage> {
     });
   }
 
+  String? _guessUnit(EventField field, String valueLabel) {
+    final name = field.name.toLowerCase();
+    if (name == 'max_speed') {
+      final val = valueLabel.toLowerCase();
+      if (val.contains('mph')) return 'mph';
+      return 'kph';
+    }
+    return _defaultUnitForField(field);
+  }
+
   Future<void> _deleteEntry(LocoAttrVersion entry) async {
     if (_isDeleting) return;
     final blockId = entry.versionId;
@@ -241,7 +267,7 @@ class _LocoTimelinePageState extends State<LocoTimelinePage> {
             invalid.add('Field ${field.field.display} is empty');
             break;
           }
-          values[field.field.name] = val;
+          values[field.field.name] = _normalizeFieldValue(field);
         }
         if (invalid.isNotEmpty) continue;
         if (values.isEmpty) {

lib/components/pages/loco_timeline/event_editor.dart

@@ -184,7 +184,9 @@ class _FieldList extends StatelessWidget {
               value: null,
               onChanged: (field) {
                 if (field == null) return;
-                draft.fields.add(_FieldEntry(field: field));
+                draft.fields.add(
+                  _FieldEntry(field: field)..unit = _defaultUnitForField(field),
+                );
                 onChange();
               },
               items: availableFields
@@ -224,10 +226,10 @@ class _FieldList extends StatelessWidget {
                           ),
                           const SizedBox(height: 4),
                           _FieldInput(
-                            field: field.field,
+                            entry: field,
-                            value: field.value,
+                            onChanged: (val, {String? unit}) {
-                            onChanged: (val) {
                               field.value = val;
+                              if (unit != null) field.unit = unit;
                               onChange();
                             },
                           ),
@@ -253,17 +255,18 @@ class _FieldList extends StatelessWidget {
 
 class _FieldInput extends StatelessWidget {
   const _FieldInput({
-    required this.field,
+    required this.entry,
-    required this.value,
     required this.onChanged,
   });
 
-  final EventField field;
+  final _FieldEntry entry;
-  final dynamic value;
+  final void Function(dynamic value, {String? unit}) onChanged;
-  final ValueChanged<dynamic> onChanged;
 
   @override
   Widget build(BuildContext context) {
+    final field = entry.field;
+    final value = entry.value;
+
     if (field.enumValues != null && field.enumValues!.isNotEmpty) {
       final options = field.enumValues!;
       return DropdownButtonFormField<String>(
@@ -293,6 +296,119 @@ class _FieldInput extends StatelessWidget {
       );
     }
 
+    final name = field.name.toLowerCase();
+    if (name == 'max_speed') {
+      final unit = entry.unit ?? 'kph';
+      final isNumber = true;
+      return Row(
+        children: [
+          Expanded(
+            child: TextFormField(
+              initialValue: value?.toString(),
+              onChanged: (val) {
+                final parsed = double.tryParse(val);
+                onChanged(isNumber ? parsed : val, unit: unit);
+              },
+              decoration: const InputDecoration(
+                border: OutlineInputBorder(),
+                hintText: 'Enter value',
+                suffixText: 'kph/mph',
+              ),
+              keyboardType: TextInputType.number,
+            ),
+          ),
+          const SizedBox(width: 8),
+          SizedBox(
+            width: 88,
+            child: DropdownButtonFormField<String>(
+              value: unit,
+              items: const [
+                DropdownMenuItem(value: 'kph', child: Text('kph')),
+                DropdownMenuItem(value: 'mph', child: Text('mph')),
+              ],
+              onChanged: (val) {
+                if (val == null) return;
+                onChanged(value, unit: val);
+              },
+              decoration: const InputDecoration(
+                border: OutlineInputBorder(),
+                labelText: 'Unit',
+              ),
+            ),
+          ),
+        ],
+      );
+    }
+
+    if ({
+      'height',
+      'length',
+      'width',
+      'track_gauge',
+    }.contains(name)) {
+      return TextFormField(
+        initialValue: value?.toString(),
+        onChanged: (val) {
+          final parsed = double.tryParse(val);
+          onChanged(parsed ?? val);
+        },
+        decoration: const InputDecoration(
+          border: OutlineInputBorder(),
+          hintText: 'Enter value',
+          suffixText: 'mm',
+        ),
+        keyboardType: TextInputType.number,
+      );
+    }
+
+    if (name == 'weight') {
+      return TextFormField(
+        initialValue: value?.toString(),
+        onChanged: (val) {
+          final parsed = double.tryParse(val);
+          onChanged(parsed ?? val);
+        },
+        decoration: const InputDecoration(
+          border: OutlineInputBorder(),
+          hintText: 'Enter value',
+          suffixText: 'tonnes',
+        ),
+        keyboardType: TextInputType.number,
+      );
+    }
+
+    if (name == 'power') {
+      return TextFormField(
+        initialValue: value?.toString(),
+        onChanged: (val) {
+          final parsed = double.tryParse(val);
+          onChanged(parsed ?? val);
+        },
+        decoration: const InputDecoration(
+          border: OutlineInputBorder(),
+          hintText: 'Enter value',
+          suffixText: 'kW',
+        ),
+        keyboardType: TextInputType.number,
+      );
+    }
+
+    if (name == 'tractive_effort') {
+      return TextFormField(
+        initialValue: value?.toString(),
+        onChanged: (val) {
+          final parsed = double.tryParse(val);
+          onChanged(parsed ?? val);
+        },
+        decoration: const InputDecoration(
+          border: OutlineInputBorder(),
+          hintText: 'Enter value',
+          suffixText: 'kN',
+        ),
+        keyboardType: TextInputType.number,
+      );
+    }
+
     final isNumber = type == 'int' || type == 'integer';
     return TextFormField(
       initialValue: value?.toString(),
@@ -326,6 +442,13 @@ class _EventDraft {
 class _FieldEntry {
   final EventField field;
   dynamic value;
+  String? unit;
 
   _FieldEntry({required this.field});
 }
+
+String? _defaultUnitForField(EventField field) {
+  final name = field.name.toLowerCase();
+  if (name == 'max_speed') return 'kph';
+  return null;
+}

lib/components/pages/loco_timeline/timeline_grid.dart

@@ -577,7 +577,7 @@ class _TimelineModel {
           _ValueSegment(
             start: start,
             end: end,
-            value: entry.valueLabel,
+            value: _formatValueWithUnits(entry),
             entry: entry,
           ),
         );
@@ -680,6 +680,53 @@ class _TimelineModel {
   }
 }
 
+String _formatValueWithUnits(LocoAttrVersion entry) {
+  final raw = entry.valueLabel;
+  final code = entry.attrCode.toLowerCase();
+  final lowerRaw = raw.toLowerCase();
+  // Avoid double-appending if units already present.
+  final hasUnits = lowerRaw.contains('mm') ||
+      lowerRaw.contains('tonne') ||
+      lowerRaw.contains('kph') ||
+      lowerRaw.contains('mph');
+
+  double? asNumber = double.tryParse(raw);
+  String formatNumber(double value) {
+    if (value % 1 == 0) return value.toStringAsFixed(0);
+    return value.toStringAsFixed(2);
+  }
+
+  switch (code) {
+    case 'height':
+    case 'length':
+    case 'width':
+    case 'track_gauge':
+      if (hasUnits) return raw;
+      return asNumber != null ? '${formatNumber(asNumber)} mm' : '$raw mm';
+    case 'weight':
+      if (hasUnits) return raw;
+      return asNumber != null ? '${formatNumber(asNumber)} tonnes' : '$raw tonnes';
+    case 'power':
+      if (hasUnits) return raw;
+      return asNumber != null ? '${formatNumber(asNumber)} kW' : '$raw kW';
+    case 'tractive_effort':
+      if (hasUnits) return raw;
+      return asNumber != null ? '${formatNumber(asNumber)} kN' : '$raw kN';
+    case 'max_speed':
+      if (hasUnits) return raw;
+      if (asNumber != null) {
+        // Stored as kph.
+        final formatted = asNumber % 1 == 0
+            ? asNumber.toStringAsFixed(0)
+            : asNumber.toStringAsFixed(1);
+        return '$formatted kph';
+      }
+      return '$raw kph';
+    default:
+      return raw;
+  }
+}
+
 class _AxisSegment {
   final DateTime start;
   final DateTime end;
@@ -742,7 +789,15 @@ class _RowCell {
         color: Colors.transparent,
       );
     }
-    final displayStart = _formatDate(seg.start) ?? '';
+    final entry = seg.entry;
+    String displayStart = '';
+    if (entry != null) {
+      if ((entry.maskedValidFrom ?? '').trim().isNotEmpty) {
+        displayStart = entry.maskedValidFrom!.trim();
+      } else if (entry.validFrom != null) {
+        displayStart = _formatDate(entry.validFrom) ?? '';
+      }
+    }
     return _RowCell(
       value: seg.value,
       rangeLabel: displayStart,

lib/components/pages/logbook.dart

@@ -0,0 +1,48 @@
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import 'package:mileograph_flutter/components/pages/legs.dart';
+import 'package:mileograph_flutter/components/pages/trips.dart';
+
+enum LogbookTab { entries, trips }
+
+class LogbookPage extends StatelessWidget {
+  const LogbookPage({super.key, this.initialTab = LogbookTab.entries});
+
+  final LogbookTab initialTab;
+
+  @override
+  Widget build(BuildContext context) {
+    final initialIndex = initialTab == LogbookTab.trips ? 1 : 0;
+    return DefaultTabController(
+      key: ValueKey(initialTab),
+      initialIndex: initialIndex,
+      length: 2,
+      child: Column(
+        children: [
+          TabBar(
+            onTap: (index) {
+              final dest =
+                  index == 0 ? '/logbook/entries' : '/logbook/trips';
+              final current = GoRouterState.of(context).uri.path;
+              if (current != dest) {
+                context.go(dest);
+              }
+            },
+            tabs: const [
+              Tab(text: 'Entries'),
+              Tab(text: 'Trips'),
+            ],
+          ),
+          Expanded(
+            child: TabBarView(
+              children: const [
+                LegsPage(),
+                TripsPage(),
+              ],
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/components/pages/more.dart

@@ -0,0 +1,68 @@
+import 'package:flutter/material.dart';
+import 'package:mileograph_flutter/components/pages/profile.dart';
+import 'package:mileograph_flutter/components/pages/settings.dart';
+
+class MorePage extends StatelessWidget {
+  const MorePage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Navigator(
+      onGenerateRoute: (settings) {
+        final name = settings.name ?? '/';
+        Widget page;
+        switch (name) {
+          case '/settings':
+            page = const SettingsPage();
+            break;
+          case '/profile':
+            page = const ProfilePage();
+            break;
+          case '/more/settings':
+            page = const SettingsPage();
+            break;
+          case '/more/profile':
+            page = const ProfilePage();
+            break;
+          case '/':
+          default:
+            page = _MoreHome();
+        }
+        return MaterialPageRoute(builder: (_) => page, settings: settings);
+      },
+    );
+  }
+}
+
+class _MoreHome extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return ListView(
+      padding: const EdgeInsets.all(16),
+      children: [
+        Text(
+          'More',
+          style: Theme.of(context).textTheme.headlineSmall,
+        ),
+        const SizedBox(height: 12),
+        Card(
+          child: Column(
+            children: [
+              ListTile(
+                leading: const Icon(Icons.emoji_events),
+                title: const Text('Badges'),
+                onTap: () => Navigator.of(context).pushNamed('/more/profile'),
+              ),
+              const Divider(height: 1),
+              ListTile(
+                leading: const Icon(Icons.settings),
+                title: const Text('Settings'),
+                onTap: () => Navigator.of(context).pushNamed('/more/settings'),
+              ),
+            ],
+          ),
+        ),
+      ],
+    );
+  }
+}

lib/components/pages/new_entry/new_entry_submit_logic.dart

@@ -120,6 +120,7 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
       }
       if (!mounted) return;
       dataService.refreshLegs();
+      await dataService.fetchNotifications();
       if (!mounted) return;
       messenger?.showSnackBar(
         SnackBar(
@@ -128,7 +129,9 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
       );
       _lastSubmittedSnapshot = snapshot;
       _activeDraftId = null;
-    } catch (e) {
+    } catch (e, st) {
+      debugPrint('Leg submit/update failed: $e');
+      debugPrintStack(stackTrace: st);
       if (!mounted) return;
       messenger?.showSnackBar(
         SnackBar(content: Text('Failed to submit: $e')),

lib/components/pages/new_entry/new_entry_traction_logic.dart

@@ -73,6 +73,8 @@ extension _NewEntryTractionLogic on _NewEntryPageState {
     for (var i = 0; i < _tractionItems.length; i++) {
       final item = _tractionItems[i];
       if (item.isMarker || item.loco == null) continue;
+      final locoId = item.loco!.id;
+      if (locoId == 0) continue;
       int allocPos;
       if (i > markerIndex) {
         allocPos = -(i - markerIndex);
@@ -80,8 +82,7 @@ extension _NewEntryTractionLogic on _NewEntryPageState {
         allocPos = (markerIndex - 1) - i;
       }
       payload.add({
-        "loco_type": item.loco!.type,
+        "loco_id": locoId,
-        "loco_number": item.loco!.number,
         "alloc_pos": allocPos,
         "alloc_powering": item.powering ? 1 : 0,
       });

lib/components/pages/profile.dart

@@ -0,0 +1,207 @@
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import 'package:mileograph_flutter/objects/objects.dart';
+import 'package:mileograph_flutter/services/data_service.dart';
+import 'package:provider/provider.dart';
+
+class ProfilePage extends StatefulWidget {
+  const ProfilePage({super.key});
+
+  @override
+  State<ProfilePage> createState() => _ProfilePageState();
+}
+
+class _ProfilePageState extends State<ProfilePage> {
+  bool _initialised = false;
+
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    if (_initialised) return;
+    _initialised = true;
+    _refreshAwards();
+  }
+
+  Future<void> _refreshAwards() {
+    return context.read<DataService>().fetchBadgeAwards();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final data = context.watch<DataService>();
+    final awards = data.badgeAwards;
+    final loading = data.isBadgeAwardsLoading;
+
+    return Scaffold(
+      appBar: AppBar(
+        title: const Text('Badges'),
+        leading: IconButton(
+          icon: const Icon(Icons.arrow_back),
+          onPressed: () {
+            final navigator = Navigator.of(context);
+            if (navigator.canPop()) {
+              navigator.pop();
+            } else {
+              context.go('/');
+            }
+          },
+        ),
+      ),
+      body: RefreshIndicator(
+        onRefresh: _refreshAwards,
+        child: ListView(
+          padding: const EdgeInsets.all(16),
+          children: [
+            if (loading && awards.isEmpty)
+              const Center(
+                child: Padding(
+                  padding: EdgeInsets.symmetric(vertical: 24.0),
+                  child: CircularProgressIndicator(),
+                ),
+              )
+            else if (awards.isEmpty)
+              const Padding(
+                padding: EdgeInsets.symmetric(vertical: 12.0),
+                child: Text('No badges awarded yet.'),
+              )
+            else
+              ...awards.map((award) => _buildAwardCard(context, award)),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildAwardCard(BuildContext context, BadgeAward award) {
+    final badgeName = _formatBadgeName(award.badgeCode);
+    final tier = award.badgeTier.isNotEmpty
+        ? award.badgeTier[0].toUpperCase() + award.badgeTier.substring(1)
+        : '';
+    final tierIcon = _buildTierIcon(award.badgeTier);
+    final scope = _scopeToShow(award);
+
+    return Card(
+      child: Padding(
+        padding: const EdgeInsets.all(12.0),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              children: [
+                if (tierIcon != null) ...[
+                  tierIcon,
+                  const SizedBox(width: 8),
+                ],
+                Expanded(
+                  child: Text(
+                    '$badgeName • $tier',
+                    style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                          fontWeight: FontWeight.w700,
+                        ),
+                  ),
+                ),
+                if (award.awardedAt != null)
+                  Text(
+                    _formatAwardDate(award.awardedAt!),
+                    style: Theme.of(context).textTheme.bodySmall,
+                  ),
+              ],
+            ),
+            if (scope != null && scope.isNotEmpty) ...[
+              const SizedBox(height: 6),
+              Text(
+                scope,
+                style: Theme.of(context).textTheme.bodyMedium,
+              ),
+            ],
+            if (award.loco != null) ...[
+              const SizedBox(height: 8),
+              _buildLocoInfo(context, award.loco!),
+            ],
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildLocoInfo(BuildContext context, LocoSummary loco) {
+    final lines = <String>[];
+    final classNum = [
+      if (loco.locoClass.isNotEmpty) loco.locoClass,
+      if (loco.number.isNotEmpty) loco.number,
+    ].join(' ');
+    if (classNum.isNotEmpty) lines.add(classNum);
+    if ((loco.name ?? '').isNotEmpty) lines.add(loco.name!);
+    if ((loco.livery ?? '').isNotEmpty) lines.add(loco.livery!);
+    if ((loco.location ?? '').isNotEmpty) lines.add(loco.location!);
+
+    return Row(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        const Icon(Icons.train, size: 20),
+        const SizedBox(width: 8),
+        Expanded(
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: lines.map((line) {
+              return Text(
+                line,
+                style: Theme.of(context).textTheme.bodyMedium,
+              );
+            }).toList(),
+          ),
+        ),
+      ],
+    );
+  }
+
+  String _formatBadgeName(String code) {
+    if (code.isEmpty) return 'Badge';
+    const known = {
+      'class_clearance': 'Class Clearance',
+      'loco_clearance': 'Loco Clearance',
+    };
+    final lower = code.toLowerCase();
+    if (known.containsKey(lower)) return known[lower]!;
+    final parts = code.split(RegExp(r'[_\\s]+')).where((p) => p.isNotEmpty);
+    return parts
+        .map((p) => p[0].toUpperCase() + p.substring(1).toLowerCase())
+        .join(' ');
+  }
+
+  String _formatAwardDate(DateTime date) {
+    final y = date.year.toString().padLeft(4, '0');
+    final m = date.month.toString().padLeft(2, '0');
+    final d = date.day.toString().padLeft(2, '0');
+    return '$y-$m-$d';
+  }
+
+  Widget? _buildTierIcon(String tier) {
+    final lower = tier.toLowerCase();
+    Color? color;
+    switch (lower) {
+      case 'bronze':
+        color = const Color(0xFFCD7F32);
+        break;
+      case 'silver':
+        color = const Color(0xFFC0C0C0);
+        break;
+      case 'gold':
+        color = const Color(0xFFFFD700);
+        break;
+    }
+    if (color == null) return null;
+    return Icon(Icons.emoji_events, color: color);
+  }
+
+  String? _scopeToShow(BadgeAward award) {
+    final scope = award.scopeValue?.trim() ?? '';
+    if (scope.isEmpty) return null;
+    final code = award.badgeCode.toLowerCase();
+    if (code == 'loco_clearance') {
+      // Hide numeric loco IDs; loco details are shown separately.
+      if (int.tryParse(scope) != null) return null;
+    }
+    return scope;
+  }
+}

lib/components/pages/traction/traction.dart

@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'dart:convert';
 
 import 'package:flutter/material.dart';

lib/components/pages/trips.dart

@@ -12,6 +12,7 @@ class TripsPage extends StatefulWidget {
 
 class _TripsPageState extends State<TripsPage> {
   bool _initialised = false;
+  final Map<int, Future<List<TripLocoStat>>> _tripLocoStatsFutures = {};
 
   @override
   void didChangeDependencies() {
@@ -23,7 +24,13 @@ class _TripsPageState extends State<TripsPage> {
   }
 
   Future<void> _refreshTrips() async {
-    await context.read<DataService>().fetchTripDetails();
+    _tripLocoStatsFutures.clear();
+    final data = context.read<DataService>();
+    await data.fetchTripDetails();
+    if (!mounted) return;
+    for (final trip in data.tripDetails) {
+      _tripStatsFuture(trip.id);
+    }
   }
 
   Future<void> _renameTrip(TripDetail trip, String newName) async {
@@ -47,6 +54,13 @@ class _TripsPageState extends State<TripsPage> {
     }
   }
 
+  Future<List<TripLocoStat>> _tripStatsFuture(int tripId) {
+    return _tripLocoStatsFutures.putIfAbsent(
+      tripId,
+      () => context.read<DataService>().fetchTripLocoStats(tripId),
+    );
+  }
+
   Future<String?> _promptTripName(BuildContext context, String initial) async {
     final controller = TextEditingController(text: initial);
     final newName = await showDialog<String>(
@@ -80,7 +94,6 @@ class _TripsPageState extends State<TripsPage> {
     final data = context.watch<DataService>();
     final tripDetails = data.tripDetails;
     final tripSummaries = data.trips;
-    final isMobile = MediaQuery.of(context).size.width < 700;
     final showLoading = data.isTripDetailsLoading && tripDetails.isEmpty;
 
     return RefreshIndicator(
@@ -171,92 +184,191 @@ class _TripsPageState extends State<TripsPage> {
           }
 
           final trip = tripDetails[index - 1];
-          return _buildTripCard(context, trip, isMobile);
+          return _buildTripCard(context, trip);
         },
       ),
     );
   }
 
-  Widget _buildTripCard(BuildContext context, TripDetail trip, bool isMobile) {
+  Widget _buildTripCard(BuildContext context, TripDetail trip) {
     final legs = trip.legs;
+    final legCount = trip.legCount > 0 ? trip.legCount : legs.length;
+    final dateRange = _formatDateRange(legs);
+    final endpoints = _formatEndpoints(legs);
+    final statsFuture = _tripStatsFuture(trip.id);
+
     return Card(
       child: Padding(
-        padding: const EdgeInsets.all(12.0),
+        padding: const EdgeInsets.all(16.0),
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
             Row(
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              crossAxisAlignment: CrossAxisAlignment.start,
               children: [
+                Expanded(
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Text(
+                        'Trip',
+                        style: Theme.of(context).textTheme.labelMedium,
+                      ),
+                      const SizedBox(height: 4),
+                      Text(
+                        trip.name,
+                        style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                          fontWeight: FontWeight.w700,
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
                 Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
+                  crossAxisAlignment: CrossAxisAlignment.end,
                   children: [
                     Text(
-                      trip.name,
+                      trip.mileage.toStringAsFixed(1),
-                      style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                      style:
-                        fontWeight: FontWeight.w700,
+                          Theme.of(context).textTheme.headlineSmall?.copyWith(
+                        fontWeight: FontWeight.w800,
                       ),
                     ),
                     Text(
-                      '${trip.mileage.toStringAsFixed(1)} mi · ${trip.legCount} legs',
+                      'miles',
-                      style: Theme.of(context).textTheme.bodyMedium,
+                      style: Theme.of(context).textTheme.labelMedium?.copyWith(
-                    ),
+                        color: Theme.of(context).textTheme.bodySmall?.color,
-                  ],
+                      ),
-                ),
-                Row(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    IconButton(
-                      icon: const Icon(Icons.train),
-                      tooltip: 'Traction',
-                      onPressed: () => _showTripWinners(context, trip),
-                    ),
-                    IconButton(
-                      icon: const Icon(Icons.open_in_new),
-                      tooltip: 'Details',
-                      onPressed: () => _showTripDetail(context, trip),
                     ),
                   ],
                 ),
               ],
             ),
-            const SizedBox(height: 8),
+            const SizedBox(height: 12),
-            if (legs.isNotEmpty)
+            FutureBuilder<List<TripLocoStat>>(
-              Column(
+              future: statsFuture,
-                children: legs.take(isMobile ? 2 : 3).map((leg) {
+              builder: (context, snapshot) {
-                  return ListTile(
+                final chips = <Widget>[
-                    dense: isMobile,
+                  _buildMetaChip(context, Icons.timeline, '$legCount legs'),
-                    contentPadding: EdgeInsets.zero,
+                  if (dateRange != null)
-                    leading: const Icon(Icons.train),
+                    _buildMetaChip(context, Icons.calendar_month, dateRange),
-                    title: Text('${leg.start} → ${leg.end}'),
+                  if (endpoints != null)
-                    subtitle: Text(
+                    _buildMetaChip(context, Icons.route, endpoints),
-                      _formatDate(leg.beginTime),
+                ];
-                      maxLines: 1,
+
-                      overflow: TextOverflow.ellipsis,
+                final stats = snapshot.data ?? const [];
-                    ),
+                final hasStats = stats.isNotEmpty;
-                    trailing: Text(
+                final loading =
-                      leg.mileage?.toStringAsFixed(1) ?? '-',
+                    snapshot.connectionState == ConnectionState.waiting;
-                      style: Theme.of(context).textTheme.labelLarge?.copyWith(
+
-                        fontWeight: FontWeight.bold,
+                if (loading && !hasStats) {
-                      ),
+                  chips.add(
+                    _buildMetaChip(context, Icons.train, 'Loading traction...'),
+                  );
+                } else if (hasStats) {
+                  final winnerCount = stats.where((e) => e.won).length;
+                  chips.add(
+                    _buildMetaChip(context, Icons.train, '${stats.length} had'),
+                  );
+                  chips.add(
+                    _buildMetaChip(
+                      context,
+                      Icons.emoji_events_outlined,
+                      '$winnerCount winners',
                     ),
                   );
-                }).toList(),
+                } else if (snapshot.connectionState == ConnectionState.done) {
-              ),
+                  chips.add(
-            if (legs.length > 3)
+                    _buildMetaChip(context, Icons.train, 'No traction yet'),
-              Padding(
+                  );
-                padding: const EdgeInsets.only(top: 6.0),
+                }
-                child: Text(
+
-                  '+${legs.length - 3} more legs',
+                return Wrap(
-                  style: Theme.of(context).textTheme.bodySmall,
+                  spacing: 8,
-                ),
+                  runSpacing: 8,
+                  children: chips,
+                );
+              },
+            ),
+            const SizedBox(height: 12),
+            Align(
+              alignment: Alignment.centerRight,
+              child: Wrap(
+                spacing: 8,
+                runSpacing: 8,
+                alignment: WrapAlignment.end,
+                children: [
+                  OutlinedButton.icon(
+                    icon: const Icon(Icons.train),
+                    label: const Text('Locos'),
+                    onPressed: () => _showTripWinners(context, trip),
+                  ),
+                  FilledButton.icon(
+                    icon: const Icon(Icons.open_in_new),
+                    label: const Text('Details'),
+                    onPressed: () => _showTripDetail(context, trip),
+                  ),
+                ],
               ),
+            ),
           ],
         ),
       ),
     );
   }
 
+  Widget _buildMetaChip(BuildContext context, IconData icon, String label) {
+    return Chip(
+      avatar: Icon(icon, size: 16),
+      label: Text(label),
+      visualDensity: const VisualDensity(horizontal: -2, vertical: -2),
+      materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
+    );
+  }
+
+  String? _formatDateRange(List<TripLeg> legs) {
+    final beginTimes =
+        legs.map((e) => e.beginTime).whereType<DateTime>().toList();
+    if (beginTimes.isEmpty) return null;
+    final start = beginTimes.first;
+    final end = beginTimes.last;
+    final startStr = _formatFriendlyDate(start);
+    final endStr = _formatFriendlyDate(end);
+    if (startStr == endStr) return startStr;
+    return '$startStr - $endStr';
+  }
+
+  String _formatFriendlyDate(DateTime date) {
+    const months = [
+      'Jan',
+      'Feb',
+      'Mar',
+      'Apr',
+      'May',
+      'Jun',
+      'Jul',
+      'Aug',
+      'Sep',
+      'Oct',
+      'Nov',
+      'Dec',
+    ];
+    final day = date.day.toString().padLeft(2, '0');
+    final monthIndex = (date.month - 1).clamp(0, months.length - 1).toInt();
+    final month = months[monthIndex];
+    return '$day $month ${date.year}';
+  }
+
+  String? _formatEndpoints(List<TripLeg> legs) {
+    if (legs.isEmpty) return null;
+    final start = legs.first.start;
+    final end = legs.last.end;
+    if (start.isEmpty && end.isEmpty) return null;
+    final startLabel = start.isNotEmpty ? start : '—';
+    final endLabel = end.isNotEmpty ? end : '—';
+    return '$startLabel → $endLabel';
+  }
+
   String _formatDate(DateTime? date) {
     if (date == null) return '';
     return '${date.year.toString().padLeft(4, '0')}-${date.month.toString().padLeft(2, '0')}-${date.day.toString().padLeft(2, '0')}';
@@ -323,6 +435,7 @@ class _TripsPageState extends State<TripsPage> {
                   data.fetchTripDetails(),
                   data.fetchTrips(),
                 ]);
+                _tripLocoStatsFutures.remove(trip.id);
                 if (!mounted) return;
                 messenger?.showSnackBar(
                   SnackBar(content: Text('Deleted "${trip.name}"')),
@@ -424,10 +537,9 @@ class _TripsPageState extends State<TripsPage> {
       context: context,
       isScrollControlled: true,
       builder: (_) {
-        final data = context.read<DataService>();
         return SafeArea(
           child: FutureBuilder<List<TripLocoStat>>(
-            future: data.fetchTripLocoStats(trip.id),
+            future: _tripStatsFuture(trip.id),
             builder: (ctx, snapshot) {
               final items = snapshot.data ?? [];
               final loading =

lib/objects/objects.dart

@@ -750,3 +750,80 @@ class EventField {
     );
   }
 }
+
+class UserNotification {
+  final int id;
+  final String title;
+  final String body;
+  final DateTime? createdAt;
+  final bool dismissed;
+
+  UserNotification({
+    required this.id,
+    required this.title,
+    required this.body,
+    required this.createdAt,
+    required this.dismissed,
+  });
+
+  factory UserNotification.fromJson(Map<String, dynamic> json) {
+    final created = json['created_at'] ?? json['createdAt'];
+    DateTime? createdAt;
+    if (created is String) {
+      createdAt = DateTime.tryParse(created);
+    } else if (created is DateTime) {
+      createdAt = created;
+    }
+    return UserNotification(
+      id: _asInt(json['notification_id'] ?? json['id']),
+      title: _asString(json['title']),
+      body: _asString(json['body']),
+      createdAt: createdAt,
+      dismissed: _asBool(json['dismissed'] ?? false, false),
+    );
+  }
+}
+
+class BadgeAward {
+  final int id;
+  final int badgeId;
+  final String badgeCode;
+  final String badgeTier;
+  final String? scopeValue;
+  final DateTime? awardedAt;
+  final LocoSummary? loco;
+
+  BadgeAward({
+    required this.id,
+    required this.badgeId,
+    required this.badgeCode,
+    required this.badgeTier,
+    this.scopeValue,
+    this.awardedAt,
+    this.loco,
+  });
+
+  factory BadgeAward.fromJson(Map<String, dynamic> json) {
+    final awarded = json['awarded_at'] ?? json['awardedAt'];
+    DateTime? awardedAt;
+    if (awarded is String) {
+      awardedAt = DateTime.tryParse(awarded);
+    } else if (awarded is DateTime) {
+      awardedAt = awarded;
+    }
+    final locoJson = json['loco'];
+    LocoSummary? loco;
+    if (locoJson is Map<String, dynamic>) {
+      loco = LocoSummary.fromJson(Map<String, dynamic>.from(locoJson));
+    }
+    return BadgeAward(
+      id: _asInt(json['award_id'] ?? json['id']),
+      badgeId: _asInt(json['badge_id'] ?? 0),
+      badgeCode: _asString(json['badge_code']),
+      badgeTier: _asString(json['badge_tier']),
+      scopeValue: _asString(json['scope_value']),
+      awardedAt: awardedAt,
+      loco: loco,
+    );
+  }
+}

lib/services/data_service/data_service.dart

@@ -9,4 +9,5 @@ import 'package:mileograph_flutter/services/api_service.dart';
 part 'data_service_core.dart';
 part 'data_service_traction.dart';
 part 'data_service_trips.dart';
-
+part 'data_service_notifications.dart';
+part 'data_service_badges.dart';

lib/services/data_service/data_service_badges.dart

@@ -0,0 +1,42 @@
+part of 'data_service.dart';
+
+extension DataServiceBadges on DataService {
+  Future<void> fetchBadgeAwards() async {
+    _isBadgeAwardsLoading = true;
+    try {
+      final json = await api.get('/badge/awards/me');
+      List<dynamic>? list;
+      if (json is List) {
+        list = json;
+      } else if (json is Map) {
+        for (final key in ['awards', 'badge_awards', 'data']) {
+          final value = json[key];
+          if (value is List) {
+            list = value;
+            break;
+          }
+        }
+      }
+      final parsed = list
+          ?.whereType<Map<String, dynamic>>()
+          .map(BadgeAward.fromJson)
+          .toList();
+      if (parsed != null) {
+        parsed.sort((a, b) {
+          final aTs = a.awardedAt?.millisecondsSinceEpoch ?? 0;
+          final bTs = b.awardedAt?.millisecondsSinceEpoch ?? 0;
+          return bTs.compareTo(aTs);
+        });
+        _badgeAwards = parsed;
+      } else {
+        _badgeAwards = [];
+      }
+    } catch (e) {
+      debugPrint('Failed to fetch badge awards: $e');
+      _badgeAwards = [];
+    } finally {
+      _isBadgeAwardsLoading = false;
+      _notifyAsync();
+    }
+  }
+}

lib/services/data_service/data_service_core.dart

@@ -48,6 +48,9 @@ class DataService extends ChangeNotifier {
   List<LocoChange> get latestLocoChanges => _latestLocoChanges;
   bool _isLatestLocoChangesLoading = false;
   bool get isLatestLocoChangesLoading => _isLatestLocoChangesLoading;
+  bool _latestLocoChangesHasMore = false;
+  bool get latestLocoChangesHasMore => _latestLocoChangesHasMore;
+  int _latestLocoChangesFetched = 0;
   final Map<int, List<LocoAttrVersion>> _locoTimelines = {};
   final Map<int, bool> _isLocoTimelineLoading = {};
   List<LocoAttrVersion> timelineForLoco(int locoId) =>
@@ -88,6 +91,18 @@ class DataService extends ChangeNotifier {
   bool _isOnThisDayLoading = false;
   bool get isOnThisDayLoading => _isOnThisDayLoading;
 
+  // Notifications
+  List<UserNotification> _notifications = [];
+  List<UserNotification> get notifications => _notifications;
+  bool _isNotificationsLoading = false;
+  bool get isNotificationsLoading => _isNotificationsLoading;
+
+  // Badges
+  List<BadgeAward> _badgeAwards = [];
+  List<BadgeAward> get badgeAwards => _badgeAwards;
+  bool _isBadgeAwardsLoading = false;
+  bool get isBadgeAwardsLoading => _isBadgeAwardsLoading;
+
   static const List<EventField> _fallbackEventFields = [
     EventField(name: 'operator', display: 'Operator'),
     EventField(name: 'status', display: 'Status'),

lib/services/data_service/data_service_notifications.dart

@@ -0,0 +1,62 @@
+part of 'data_service.dart';
+
+extension DataServiceNotifications on DataService {
+  Future<void> fetchNotifications() async {
+    _isNotificationsLoading = true;
+    try {
+      final json = await api.get('/notifications');
+      List<dynamic>? list;
+      if (json is List) {
+        list = json;
+      } else if (json is Map) {
+        for (final key in ['notifications', 'data', 'items']) {
+          final value = json[key];
+          if (value is List) {
+            list = value;
+            break;
+          }
+        }
+      }
+      final parsed = list
+          ?.whereType<Map<String, dynamic>>()
+          .map(UserNotification.fromJson)
+          .where((n) => !n.dismissed)
+          .toList();
+
+      if (parsed != null) {
+        parsed.sort((a, b) {
+          final aTs = a.createdAt?.millisecondsSinceEpoch ?? 0;
+          final bTs = b.createdAt?.millisecondsSinceEpoch ?? 0;
+          return bTs.compareTo(aTs);
+        });
+        _notifications = parsed;
+      } else {
+        _notifications = [];
+      }
+    } catch (e) {
+      debugPrint('Failed to fetch notifications: $e');
+      _notifications = [];
+    } finally {
+      _isNotificationsLoading = false;
+      _notifyAsync();
+    }
+  }
+
+  Future<void> dismissNotifications(List<int> notificationIds) async {
+    if (notificationIds.isEmpty) return;
+    try {
+      await api.put('/notifications/dismiss', {
+        "notification_ids": notificationIds,
+        "payload": {"dismissed": true},
+      });
+      _notifications = _notifications
+          .where((n) => !notificationIds.contains(n.id))
+          .toList();
+    } catch (e) {
+      debugPrint('Failed to dismiss notifications: $e');
+      rethrow;
+    } finally {
+      _notifyAsync();
+    }
+  }
+}

lib/services/data_service/data_service_traction.dart

@@ -115,7 +115,11 @@ extension DataServiceTraction on DataService {
     return _locoClasses;
   }
 
-  Future<void> fetchLatestLocoChanges({int limit = 25, int offset = 0}) async {
+  Future<void> fetchLatestLocoChanges({
+    int limit = 100,
+    int offset = 0,
+    bool append = false,
+  }) async {
     _isLatestLocoChangesLoading = true;
     _notifyAsync();
     try {
@@ -138,16 +142,41 @@ extension DataServiceTraction on DataService {
             );
           }
         }
-        _latestLocoChanges = parsed;
+        if (append) {
+          _latestLocoChanges = [..._latestLocoChanges, ...parsed];
+        } else {
+          _latestLocoChanges = parsed;
+        }
+        final fetchedCount = parsed.length;
+        _latestLocoChangesFetched = append
+            ? offset + fetchedCount
+            : fetchedCount;
+        _latestLocoChangesHasMore = _latestLocoChangesFetched < 5000;
       } else {
         throw Exception('Unexpected latest loco changes response: $json');
       }
     } catch (e) {
       debugPrint('Failed to fetch latest loco changes: $e');
       _latestLocoChanges = [];
+      _latestLocoChangesHasMore = false;
+      _latestLocoChangesFetched = 0;
     } finally {
       _isLatestLocoChangesLoading = false;
       _notifyAsync();
     }
   }
+
+  Future<Map<String, dynamic>?> fetchClassStats(String locoClass) async {
+    try {
+      final path = Uri.encodeComponent(locoClass);
+      final json = await api.get('/loco/class/stats/$path/user');
+      if (json is Map) {
+        return Map<String, dynamic>.from(json);
+      }
+      debugPrint('Unexpected class stats response for $locoClass: $json');
+    } catch (e) {
+      debugPrint('Failed to fetch class stats for $locoClass: $e');
+    }
+    return null;
+  }
 }

lib/ui/app_shell.dart

@@ -1,19 +1,19 @@
 import 'package:dynamic_color/dynamic_color.dart';
+import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:go_router/go_router.dart';
 import 'package:mileograph_flutter/components/login/login.dart';
-import 'package:mileograph_flutter/components/pages/calculator.dart';
-import 'package:mileograph_flutter/components/pages/calculator_details.dart';
 import 'package:mileograph_flutter/components/pages/dashboard.dart';
-import 'package:mileograph_flutter/components/pages/legs.dart';
 import 'package:mileograph_flutter/components/pages/loco_legs.dart';
 import 'package:mileograph_flutter/components/pages/loco_timeline.dart';
+import 'package:mileograph_flutter/components/pages/logbook.dart';
+import 'package:mileograph_flutter/components/pages/more.dart';
 import 'package:mileograph_flutter/components/pages/new_entry.dart';
 import 'package:mileograph_flutter/components/pages/new_traction.dart';
+import 'package:mileograph_flutter/components/pages/profile.dart';
 import 'package:mileograph_flutter/components/pages/settings.dart';
 import 'package:mileograph_flutter/components/pages/traction.dart';
-import 'package:mileograph_flutter/components/pages/trips.dart';
 import 'package:mileograph_flutter/services/authservice.dart';
 import 'package:mileograph_flutter/services/data_service.dart';
 import 'package:mileograph_flutter/services/navigation_guard.dart';
@@ -22,12 +22,11 @@ import 'package:provider/provider.dart';
 final GlobalKey<NavigatorState> _shellNavigatorKey = GlobalKey<NavigatorState>();
 
 const List<String> _contentPages = [
-  "/",
+  "/dashboard",
-  "/calculator",
+  "/logbook/entries",
-  "/legs",
   "/traction",
-  "/trips",
   "/add",
+  "/more",
 ];
 
 const int _addTabIndex = 5;
@@ -40,19 +39,33 @@ class _NavItem {
 
 const List<_NavItem> _navItems = [
   _NavItem("Home", Icons.home),
-  _NavItem("Calculator", Icons.route),
+  _NavItem("Logbook", Icons.menu_book),
-  _NavItem("Entries", Icons.list),
   _NavItem("Traction", Icons.train),
-  _NavItem("Trips", Icons.book),
   _NavItem("Add", Icons.add),
+  _NavItem("More", Icons.more_horiz),
 ];
 
 int tabIndexForPath(String path) {
-  final newIndex = _contentPages.indexWhere((routePath) {
+  var matchPath = path;
-    if (path == routePath) return true;
+  if (matchPath == '/') matchPath = '/dashboard';
-    if (routePath == '/') return path == '/';
+  if (matchPath.startsWith('/dashboard')) return 0;
-    return path.startsWith('$routePath/');
+  if (matchPath.startsWith('/legs')) {
-  });
+    matchPath = '/logbook/entries';
+  } else if (matchPath.startsWith('/trips')) {
+    matchPath = '/logbook/trips';
+  } else if (matchPath == '/logbook') {
+    matchPath = '/logbook/entries';
+  } else if (matchPath.startsWith('/logbook/trips')) {
+    matchPath = '/logbook/entries';
+  } else if (matchPath.startsWith('/profile') ||
+      matchPath.startsWith('/settings') ||
+      matchPath.startsWith('/more')) {
+    matchPath = '/more';
+  }
+  final newIndex = _contentPages.indexWhere(
+    (routePath) =>
+        matchPath == routePath || matchPath.startsWith('$routePath/'),
+  );
   return newIndex < 0 ? 0 : newIndex;
 }
 
@@ -80,6 +93,7 @@ class _MyAppState extends State<MyApp> {
     _routerInitialized = true;
     final auth = context.read<AuthService>();
     _router = GoRouter(
+      initialLocation: '/dashboard',
       refreshListenable: auth,
       redirect: (context, state) {
         final loggedIn = auth.isLoggedIn;
@@ -87,29 +101,52 @@ class _MyAppState extends State<MyApp> {
         final atSettings = state.uri.toString() == '/settings';
 
         if (!loggedIn && !loggingIn && !atSettings) return '/login';
-        if (loggedIn && loggingIn) return '/';
+        if (loggedIn && loggingIn) return '/dashboard';
         return null;
       },
       routes: [
+        GoRoute(
+          path: '/',
+          redirect: (_, __) => '/dashboard',
+        ),
         ShellRoute(
           navigatorKey: _shellNavigatorKey,
           builder: (context, state, child) => MyHomePage(child: child),
           routes: [
-            GoRoute(path: '/', builder: (context, state) => const Dashboard()),
             GoRoute(
-              path: '/calculator',
+              path: '/dashboard',
-              builder: (context, state) => CalculatorPage(),
+              builder: (context, state) => const Dashboard(),
             ),
             GoRoute(
-              path: '/calculator/details',
+              path: '/logbook',
+              builder: (context, state) => const LogbookPage(),
+            ),
+            GoRoute(
+              path: '/logbook/entries',
+              builder: (context, state) => const LogbookPage(),
+            ),
+            GoRoute(
+              path: '/logbook/trips',
               builder: (context, state) =>
-                  CalculatorDetailsPage(result: state.extra),
+                  const LogbookPage(initialTab: LogbookTab.trips),
+            ),
+            GoRoute(
+              path: '/trips',
+              builder: (context, state) =>
+                  const LogbookPage(initialTab: LogbookTab.trips),
+            ),
+            GoRoute(
+              path: '/legs',
+              builder: (context, state) => const LogbookPage(),
             ),
-            GoRoute(path: '/legs', builder: (context, state) => LegsPage()),
             GoRoute(
               path: '/traction',
               builder: (context, state) => TractionPage(),
             ),
+            GoRoute(
+              path: '/profile',
+              builder: (context, state) => const ProfilePage(),
+            ),
             GoRoute(
               path: '/traction/:id/timeline',
               builder: (_, state) {
@@ -146,8 +183,19 @@ class _MyAppState extends State<MyApp> {
               path: '/traction/new',
               builder: (context, state) => const NewTractionPage(),
             ),
-            GoRoute(path: '/trips', builder: (context, state) => TripsPage()),
             GoRoute(path: '/add', builder: (context, state) => NewEntryPage()),
+            GoRoute(
+              path: '/more',
+              builder: (context, state) => const MorePage(),
+            ),
+            GoRoute(
+              path: '/more/profile',
+              builder: (context, state) => const ProfilePage(),
+            ),
+            GoRoute(
+              path: '/more/settings',
+              builder: (context, state) => const SettingsPage(),
+            ),
             GoRoute(
               path: '/legs/edit/:id',
               builder: (_, state) {
@@ -189,6 +237,14 @@ class _MyAppState extends State<MyApp> {
   }
 }
 
+class _BackIntent extends Intent {
+  const _BackIntent();
+}
+
+class _ForwardIntent extends Intent {
+  const _ForwardIntent();
+}
+
 class MyHomePage extends StatefulWidget {
   final Widget child;
   const MyHomePage({super.key, required this.child});
@@ -201,20 +257,28 @@ class _MyHomePageState extends State<MyHomePage> {
   List<String> get contentPages => _contentPages;
 
   Future<void> _onItemTapped(int index, int currentIndex) async {
-    if (index < 0 || index >= contentPages.length || index == currentIndex) {
+    if (index < 0 || index >= contentPages.length) {
       return;
     }
+    final currentPath = GoRouterState.of(context).uri.path;
+    final targetPath = contentPages[index];
+    final alreadyAtTarget =
+        currentPath == targetPath || currentPath.startsWith('$targetPath/');
+    if (index == currentIndex && alreadyAtTarget) return;
+
     await NavigationGuard.attemptNavigation(() async {
       if (!mounted) return;
-      context.go(contentPages[index]);
+      _navigateToIndex(index);
     });
   }
 
-  int? _lastTabIndex;
+  final List<int> _history = [];
-  final List<int> _tabHistory = [];
+  int _historyPosition = -1;
-  bool _handlingBackNavigation = false;
+  final List<int> _forwardHistory = [];
+  bool _suppressRecord = false;
 
   bool _fetched = false;
+  bool _railCollapsed = false;
 
   @override
   void didChangeDependencies() {
@@ -248,6 +312,9 @@ class _MyHomePageState extends State<MyHomePage> {
         if (data.tripDetails.isEmpty) {
           data.fetchTripDetails();
         }
+        if (data.notifications.isEmpty) {
+          data.fetchNotifications();
+        }
       });
     });
   }
@@ -256,149 +323,530 @@ class _MyHomePageState extends State<MyHomePage> {
   Widget build(BuildContext context) {
     final uri = GoRouterState.of(context).uri;
     final pageIndex = tabIndexForPath(uri.path);
-    _recordTabChange(pageIndex);
+    _syncHistory(pageIndex);
     if (pageIndex != _addTabIndex) {
       NavigationGuard.unregister();
     }
     final homepageReady = context.select<DataService, bool>(
       (data) => data.homepageStats != null || !data.isHomepageLoading,
     );
+    final data = context.watch<DataService>();
     final auth = context.read<AuthService>();
 
     final currentPage = homepageReady
         ? widget.child
         : const Center(child: CircularProgressIndicator());
 
-    return PopScope(
+    final scaffold = LayoutBuilder(
-      canPop: false,
+      builder: (context, constraints) {
-      onPopInvokedWithResult: (didPop, _) async {
+        final isWide = constraints.maxWidth >= 900;
-        if (didPop) return;
+        final defaultRailExtended = constraints.maxWidth >= 1400;
+        final railExtended = defaultRailExtended && !_railCollapsed;
+        final showRailToggle = defaultRailExtended;
+        final navRailDestinations = _navItems
+            .map(
+              (item) => NavigationRailDestination(
+                icon: Icon(item.icon),
+                label: Text(item.label),
+              ),
+            )
+            .toList();
+        final navBarDestinations = _navItems
+            .map(
+              (item) => NavigationDestination(
+                icon: Icon(item.icon),
+                label: item.label,
+              ),
+            )
+            .toList();
 
-        final shellNav = _shellNavigatorKey.currentState;
+        return Scaffold(
-        if (shellNav != null && shellNav.canPop()) {
+          appBar: AppBar(
-          shellNav.pop();
+            backgroundColor: Theme.of(context).colorScheme.inversePrimary,
-          return;
+            title: Text.rich(
-        }
+              TextSpan(
-
+                children: const [
-        if (_tabHistory.isNotEmpty) {
+                  TextSpan(text: "Mile"),
-          final previousTab = _tabHistory.removeLast();
+                  TextSpan(text: "O", style: TextStyle(color: Colors.red)),
-          if (!mounted) return;
+                  TextSpan(text: "graph"),
-          _handlingBackNavigation = true;
+                ],
-          context.go(contentPages[previousTab]);
+                style: const TextStyle(
-          return;
+                  decoration: TextDecoration.none,
-        }
+                  color: Colors.white,
-
+                  fontFamily: "Tomatoes",
-        if (pageIndex != 0) {
-          if (!mounted) return;
-          _handlingBackNavigation = true;
-          context.go(contentPages[0]);
-          return;
-        }
-
-        SystemNavigator.pop();
-      },
-      child: LayoutBuilder(
-        builder: (context, constraints) {
-          final isWide = constraints.maxWidth >= 900;
-          final railExtended = constraints.maxWidth >= 1400;
-          final navRailDestinations = _navItems
-              .map(
-                (item) => NavigationRailDestination(
-                  icon: Icon(item.icon),
-                  label: Text(item.label),
-                ),
-              )
-              .toList();
-          final navBarDestinations = _navItems
-              .map(
-                (item) => NavigationDestination(
-                  icon: Icon(item.icon),
-                  label: item.label,
-                ),
-              )
-              .toList();
-
-          return Scaffold(
-            appBar: AppBar(
-              backgroundColor: Theme.of(context).colorScheme.inversePrimary,
-              title: Text.rich(
-                TextSpan(
-                  children: const [
-                    TextSpan(text: "Mile"),
-                    TextSpan(text: "O", style: TextStyle(color: Colors.red)),
-                    TextSpan(text: "graph"),
-                  ],
-                  style: const TextStyle(
-                    decoration: TextDecoration.none,
-                    color: Colors.white,
-                    fontFamily: "Tomatoes",
-                  ),
                 ),
               ),
-              actions: [
-                const IconButton(
-                  onPressed: null,
-                  icon: Icon(Icons.account_circle),
-                ),
-                IconButton(
-                  tooltip: 'Settings',
-                  onPressed: () => context.go('/settings'),
-                  icon: const Icon(Icons.settings),
-                ),
-                IconButton(onPressed: auth.logout, icon: const Icon(Icons.logout)),
-              ],
             ),
-            bottomNavigationBar: isWide
+            actions: [
-                ? null
+              _buildNotificationAction(context, data),
-                : NavigationBar(
+              IconButton(
-                    selectedIndex: pageIndex,
+                tooltip: 'Settings',
-                    onDestinationSelected: (int index) =>
+                onPressed: () => context.go('/more/settings'),
-                        _onItemTapped(index, pageIndex),
+                icon: const Icon(Icons.settings),
-                    destinations: navBarDestinations,
+              ),
-                  ),
+              IconButton(onPressed: auth.logout, icon: const Icon(Icons.logout)),
-            body: isWide
+            ],
-                ? Row(
+          ),
-                    children: [
+          bottomNavigationBar: isWide
-                      SafeArea(
+              ? null
-                        child: NavigationRail(
+              : NavigationBar(
-                          selectedIndex: pageIndex,
+                  selectedIndex: pageIndex,
-                          extended: railExtended,
+                  onDestinationSelected: (int index) =>
-                          labelType: railExtended
+                      _onItemTapped(index, pageIndex),
-                              ? NavigationRailLabelType.none
+                  destinations: navBarDestinations,
-                              : NavigationRailLabelType.selected,
+                ),
-                          onDestinationSelected: (int index) =>
+          body: isWide
-                              _onItemTapped(index, pageIndex),
+              ? Row(
-                          destinations: navRailDestinations,
+                  children: [
-                        ),
+                    SafeArea(
+                      child: LayoutBuilder(
+                        builder: (ctx, _) {
+                          return Stack(
+                            children: [
+                              Padding(
+                                padding: EdgeInsets.only(
+                                  bottom: showRailToggle ? 56.0 : 0.0,
+                                ),
+                                child: NavigationRail(
+                                  selectedIndex: pageIndex,
+                                  extended: railExtended,
+                                  labelType: railExtended
+                                      ? NavigationRailLabelType.none
+                                      : NavigationRailLabelType.selected,
+                                  onDestinationSelected: (int index) =>
+                                      _onItemTapped(index, pageIndex),
+                                  destinations: navRailDestinations,
+                                ),
+                              ),
+                              if (showRailToggle)
+                                Positioned(
+                                  left: 0,
+                                  right: 0,
+                                  bottom: 8,
+                                  child: _buildRailToggleButton(railExtended),
+                                ),
+                            ],
+                          );
+                        },
                       ),
-                      const VerticalDivider(width: 1),
+                    ),
-                      Expanded(child: currentPage),
+                    const VerticalDivider(width: 1),
-                    ],
+                    Expanded(child: currentPage),
-                  )
+                  ],
-                : currentPage,
+                )
-          );
+              : currentPage,
+        );
+      },
+    );
+
+    return Shortcuts(
+      shortcuts: <LogicalKeySet, Intent>{
+        LogicalKeySet(LogicalKeyboardKey.browserBack): const _BackIntent(),
+        LogicalKeySet(LogicalKeyboardKey.browserForward): const _ForwardIntent(),
+      },
+      child: Actions(
+        actions: {
+          _BackIntent: CallbackAction<_BackIntent>(
+            onInvoke: (_) {
+              _handleBackNavigation(allowExit: false, recordForward: true);
+              return null;
+            },
+          ),
+          _ForwardIntent: CallbackAction<_ForwardIntent>(
+            onInvoke: (_) {
+              _handleForwardNavigation();
+              return null;
+            },
+          ),
         },
+        child: Focus(
+          autofocus: true,
+          child: Listener(
+            onPointerDown: _handlePointerButtons,
+            behavior: HitTestBehavior.opaque,
+            child: PopScope(
+              canPop: false,
+              onPopInvokedWithResult: (didPop, _) async {
+                if (didPop) return;
+                await _handleBackNavigation(allowExit: true, recordForward: false);
+              },
+              child: scaffold,
+            ),
+          ),
+        ),
       ),
     );
   }
 
-  void _recordTabChange(int pageIndex) {
+  void _handlePointerButtons(PointerDownEvent event) {
-    final last = _lastTabIndex;
+    // Support mouse back/forward buttons.
-    if (last == null) {
+    if (event.buttons == kBackMouseButton) {
-      _lastTabIndex = pageIndex;
+      _handleBackNavigation(allowExit: false, recordForward: true);
-      return;
+    } else if (event.buttons == kForwardMouseButton) {
+      _handleForwardNavigation();
     }
-    if (last == pageIndex) return;
+  }
 
-    if (_handlingBackNavigation) {
+  Widget _buildRailToggleButton(bool railExtended) {
-      _handlingBackNavigation = false;
+    final collapseIcon = railExtended ? Icons.chevron_left : Icons.chevron_right;
-      _lastTabIndex = pageIndex;
+    final collapseLabel = railExtended ? 'Collapse' : 'Expand';
-      return;
+
+    if (railExtended) {
+      return Padding(
+        padding: const EdgeInsets.symmetric(vertical: 8.0),
+        child: TextButton.icon(
+          onPressed: () => setState(() => _railCollapsed = !_railCollapsed),
+          icon: Icon(collapseIcon),
+          label: Text(collapseLabel),
+        ),
+      );
     }
 
-    if (_tabHistory.isEmpty || _tabHistory.last != last) {
+    return Padding(
-      _tabHistory.add(last);
+      padding: const EdgeInsets.symmetric(vertical: 8.0),
+      child: IconButton(
+        icon: Icon(collapseIcon),
+        tooltip: collapseLabel,
+        onPressed: () => setState(() => _railCollapsed = !_railCollapsed),
+      ),
+    );
+  }
+
+  Widget _buildNotificationAction(BuildContext context, DataService data) {
+    final count = data.notifications.length;
+    final hasBadge = count > 0;
+    final badgeText = count > 9 ? '9+' : '$count';
+    final isLoading = data.isNotificationsLoading;
+
+    return Stack(
+      clipBehavior: Clip.none,
+      children: [
+        IconButton(
+          tooltip: 'Notifications',
+          onPressed: () => _openNotificationsPanel(context),
+          icon: isLoading
+              ? const SizedBox(
+                  width: 22,
+                  height: 22,
+                  child: CircularProgressIndicator(strokeWidth: 2),
+                )
+              : const Icon(Icons.notifications_none),
+        ),
+        if (hasBadge)
+          Positioned(
+            right: 6,
+            top: 8,
+            child: IgnorePointer(child: _buildBadge(badgeText)),
+          ),
+      ],
+    );
+  }
+
+  Future<void> _openNotificationsPanel(BuildContext context) async {
+    final data = context.read<DataService>();
+    try {
+      await data.fetchNotifications();
+    } catch (_) {
+      // Already logged inside data service.
     }
-    _lastTabIndex = pageIndex;
+    if (!mounted) return;
+    final isWide = MediaQuery.of(context).size.width >= 900;
+
+    final panelBuilder = (BuildContext ctx) {
+      return _buildNotificationsContent(ctx, isWide);
+    };
+
+    if (isWide) {
+      await showDialog(
+        context: context,
+        builder: (dialogCtx) => Dialog(
+          insetPadding: const EdgeInsets.all(16),
+          child: panelBuilder(dialogCtx),
+        ),
+      );
+    } else {
+      await showModalBottomSheet(
+        context: context,
+        isScrollControlled: true,
+        builder: (sheetCtx) {
+          final height = MediaQuery.of(context).size.height * 0.9;
+          return SizedBox(
+            height: height,
+            child: SafeArea(
+              child: panelBuilder(sheetCtx),
+            ),
+          );
+        },
+      );
+    }
+  }
+
+  Widget _buildNotificationsContent(BuildContext context, bool isWide) {
+    final data = context.watch<DataService>();
+    final notifications = data.notifications;
+    final loading = data.isNotificationsLoading;
+    final listHeight =
+        isWide ? 380.0 : MediaQuery.of(context).size.height * 0.6;
+
+    Widget body;
+    if (loading && notifications.isEmpty) {
+      body = const Center(
+        child: Padding(
+          padding: EdgeInsets.symmetric(vertical: 24.0),
+          child: CircularProgressIndicator(),
+        ),
+      );
+    } else if (notifications.isEmpty) {
+      body = const Padding(
+        padding: EdgeInsets.symmetric(vertical: 12.0),
+        child: Text('No notifications right now.'),
+      );
+    } else {
+      body = SizedBox(
+        height: listHeight,
+        child: ListView.separated(
+          itemCount: notifications.length,
+          separatorBuilder: (_, __) => const SizedBox(height: 8),
+          itemBuilder: (ctx, index) {
+            final item = notifications[index];
+            return Card(
+              child: Padding(
+                padding: const EdgeInsets.all(12.0),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Row(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Expanded(
+                          child: Column(
+                            crossAxisAlignment: CrossAxisAlignment.start,
+                            children: [
+                              Text(
+                                item.title.isNotEmpty
+                                    ? item.title
+                                    : 'Notification',
+                                style: Theme.of(context)
+                                    .textTheme
+                                    .titleMedium
+                                    ?.copyWith(fontWeight: FontWeight.w700),
+                              ),
+                              const SizedBox(height: 4),
+                              Text(
+                                item.body,
+                                style: Theme.of(context).textTheme.bodyMedium,
+                              ),
+                              if (item.createdAt != null) ...[
+                                const SizedBox(height: 6),
+                                Text(
+                                  _formatNotificationTime(item.createdAt!),
+                                  style: Theme.of(context)
+                                      .textTheme
+                                      .bodySmall
+                                      ?.copyWith(
+                                        color: Theme.of(context)
+                                            .textTheme
+                                            .bodySmall
+                                            ?.color
+                                            ?.withOpacity(0.7),
+                                      ),
+                                ),
+                              ],
+                            ],
+                          ),
+                        ),
+                        const SizedBox(width: 8),
+                        TextButton(
+                          onPressed: () => _dismissNotifications(
+                            context,
+                            [item.id],
+                          ),
+                          child: const Text('Dismiss'),
+                        ),
+                      ],
+                    ),
+                  ],
+                ),
+              ),
+            );
+          },
+        ),
+      );
+    }
+
+    return SizedBox(
+      width: isWide ? 420 : double.infinity,
+      child: Padding(
+        padding: const EdgeInsets.all(16.0),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              children: [
+                Text(
+                  'Notifications',
+                  style: Theme.of(context)
+                      .textTheme
+                      .titleLarge
+                      ?.copyWith(fontWeight: FontWeight.bold),
+                ),
+                const Spacer(),
+                TextButton(
+                  onPressed: notifications.isEmpty
+                      ? null
+                      : () => _dismissNotifications(
+                            context,
+                            notifications.map((e) => e.id).toList(),
+                          ),
+                  child: const Text('Dismiss all'),
+                ),
+              ],
+            ),
+            const SizedBox(height: 12),
+            body,
+          ],
+        ),
+      ),
+    );
+  }
+
+  Future<void> _dismissNotifications(
+    BuildContext context,
+    List<int> ids,
+  ) async {
+    if (ids.isEmpty) return;
+    final messenger = ScaffoldMessenger.maybeOf(context);
+    try {
+      await context.read<DataService>().dismissNotifications(ids);
+    } catch (e) {
+      messenger?.showSnackBar(
+        SnackBar(content: Text('Failed to dismiss: $e')),
+      );
+    }
+  }
+
+  String _formatNotificationTime(DateTime dateTime) {
+    final y = dateTime.year.toString().padLeft(4, '0');
+    final m = dateTime.month.toString().padLeft(2, '0');
+    final d = dateTime.day.toString().padLeft(2, '0');
+    final hh = dateTime.hour.toString().padLeft(2, '0');
+    final mm = dateTime.minute.toString().padLeft(2, '0');
+    return '$y-$m-$d $hh:$mm';
+  }
+
+  Widget _buildBadge(String label) {
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 2),
+      decoration: BoxDecoration(
+        color: Colors.redAccent,
+        borderRadius: BorderRadius.circular(10),
+      ),
+      constraints: const BoxConstraints(
+        minWidth: 20,
+      ),
+      child: Text(
+        label,
+        style: const TextStyle(
+          color: Colors.white,
+          fontSize: 11,
+          fontWeight: FontWeight.bold,
+        ),
+        textAlign: TextAlign.center,
+      ),
+    );
+  }
+
+  int get _currentPageIndex => tabIndexForPath(GoRouterState.of(context).uri.path);
+
+  Future<bool> _handleBackNavigation({
+    bool allowExit = false,
+    bool recordForward = false,
+  }) async {
+    final pageIndex = _currentPageIndex;
+    final shellNav = _shellNavigatorKey.currentState;
+    if (shellNav != null && shellNav.canPop()) {
+      shellNav.pop();
+      return true;
+    }
+
+    if (_historyPosition > 0) {
+      if (recordForward) _pushForward(pageIndex);
+      _historyPosition -= 1;
+      _suppressRecord = true;
+      context.go(contentPages[_history[_historyPosition]]);
+      return true;
+    }
+
+    if (pageIndex != 0) {
+      if (recordForward) _pushForward(pageIndex);
+      _suppressRecord = true;
+      context.go(contentPages[0]);
+      return true;
+    }
+
+    if (allowExit) {
+      SystemNavigator.pop();
+      return true;
+    }
+
+    return false;
+  }
+
+  Future<bool> _handleForwardNavigation() async {
+    if (_forwardHistory.isEmpty) return false;
+    final nextTab = _forwardHistory.removeLast();
+
+    // Move cursor forward, keeping history in sync.
+    if (_historyPosition < _history.length - 1) {
+      _historyPosition += 1;
+      _history[_historyPosition] = nextTab;
+      if (_historyPosition < _history.length - 1) {
+        _history.removeRange(_historyPosition + 1, _history.length);
+      }
+    } else {
+      _history.add(nextTab);
+      _historyPosition = _history.length - 1;
+    }
+
+    _suppressRecord = true;
+    if (!mounted) return false;
+    context.go(contentPages[nextTab]);
+    return true;
+  }
+
+  void _pushForward(int pageIndex) {
+    if (_forwardHistory.isEmpty || _forwardHistory.last != pageIndex) {
+      _forwardHistory.add(pageIndex);
+    }
+  }
+
+  void _syncHistory(int pageIndex) {
+    if (_history.isEmpty) {
+      _history.add(pageIndex);
+      _historyPosition = 0;
+      return;
+    }
+    if (_suppressRecord) {
+      _suppressRecord = false;
+      return;
+    }
+    if (_historyPosition >= 0 &&
+        _historyPosition < _history.length &&
+        _history[_historyPosition] == pageIndex) {
+      return;
+    }
+    if (_historyPosition < _history.length - 1) {
+      _history.removeRange(_historyPosition + 1, _history.length);
+    }
+    _history.add(pageIndex);
+    _historyPosition = _history.length - 1;
+    _forwardHistory.clear();
+  }
+
+  void _navigateToIndex(int index) {
+    _suppressRecord = false;
+    _forwardHistory.clear();
+    context.go(contentPages[index]);
   }
 }

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 0.3.3+1
+version: 0.4.0+1
 
 environment:
   sdk: ^3.8.1