Add friends leaderboard, reverse button in add page

.gitea/workflows/release.yml

@@ -155,6 +155,18 @@ jobs:
       - name: Build Android App Bundle (release)
         run: flutter build appbundle --release
 
+      - name: Archive Android App Bundle
+        env:
+          BASE_VERSION: ${{ needs.meta.outputs.base_version }}
+        run: |
+          set -euo pipefail
+          BUNDLE_SRC="build/app/outputs/bundle/release/app-release.aab"
+          if [ ! -f "$BUNDLE_SRC" ]; then
+            echo "Bundle not found at $BUNDLE_SRC"
+            exit 1
+          fi
+          cp "$BUNDLE_SRC" "mileograph-${BASE_VERSION}.aab"
+
       - name: Download bundletool
         run: |
           BUNDLETOOL_VERSION=1.15.6
@@ -201,6 +213,12 @@ jobs:
           name: android-apk
           path: mileograph-${{ needs.meta.outputs.base_version }}.apk
 
+      - name: Upload Android AAB artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: android-aab
+          path: mileograph-${{ needs.meta.outputs.base_version }}.aab
+
   linux-build:
     runs-on:
       - mileograph
@@ -383,6 +401,13 @@ jobs:
           name: android-apk
           path: artifacts
 
+      - name: Download Android AAB
+        if: ${{ github.ref == 'refs/heads/dev' }}
+        uses: actions/download-artifact@v3
+        with:
+          name: android-aab
+          path: artifacts
+
       - name: Prepare APK and tag
         if: ${{ github.ref == 'refs/heads/dev' }}
         id: bundle
@@ -397,11 +422,14 @@ jobs:
 
           VERSION="${BASE}${DEV_SUFFIX}"
           APK_NAME="mileograph-${VERSION}.apk"
+          AAB_NAME="mileograph-${VERSION}.aab"
 
           mv "artifacts/mileograph-${BASE}.apk" "artifacts/${APK_NAME}"
+          mv "artifacts/mileograph-${BASE}.aab" "artifacts/${AAB_NAME}"
 
           echo "tag=${TAG}" >> "$GITHUB_OUTPUT"
           echo "apk=artifacts/${APK_NAME}" >> "$GITHUB_OUTPUT"
+          echo "aab=artifacts/${AAB_NAME}" >> "$GITHUB_OUTPUT"
 
       - name: Create prerelease on Gitea
         if: ${{ github.ref == 'refs/heads/dev' }}
@@ -442,6 +470,18 @@ jobs:
             "${GITEA_BASE_URL}/api/v1/repos/${{ github.repository }}/releases/${RELEASE_ID}/assets" \
             >/dev/null
 
+          # Attach AAB
+          AAB="${{ steps.bundle.outputs.aab }}"
+          NAME_AAB=$(basename "$AAB")
+          echo "Uploading $NAME_AAB"
+
+          curl -sS -X POST \
+            -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
+            -F "attachment=@${AAB}" \
+            -F "name=${NAME_AAB}" \
+            "${GITEA_BASE_URL}/api/v1/repos/${{ github.repository }}/releases/${RELEASE_ID}/assets" \
+            >/dev/null
+
   release-master:
     runs-on:
       - mileograph
@@ -467,6 +507,13 @@ jobs:
           name: android-apk
           path: artifacts
 
+      - name: Download Android AAB
+        if: ${{ github.ref == 'refs/heads/master' }}
+        uses: actions/download-artifact@v3
+        with:
+          name: android-aab
+          path: artifacts
+
       - name: Prepare APK and tag
         if: ${{ github.ref == 'refs/heads/master' }}
         id: bundle
@@ -476,6 +523,7 @@ jobs:
 
           echo "tag=${TAG}" >> "$GITHUB_OUTPUT"
           echo "apk=artifacts/mileograph-${BASE}.apk" >> "$GITHUB_OUTPUT"
+          echo "aab=artifacts/mileograph-${BASE}.aab" >> "$GITHUB_OUTPUT"
 
       - name: Create release on Gitea
         if: ${{ github.ref == 'refs/heads/master' }}
@@ -514,3 +562,15 @@ jobs:
             -F "name=${NAME}" \
             "${GITEA_BASE_URL}/api/v1/repos/${{ github.repository }}/releases/${RELEASE_ID}/assets" \
             >/dev/null
+
+          # Attach AAB
+          AAB="${{ steps.bundle.outputs.aab }}"
+          NAME_AAB=$(basename "$AAB")
+          echo "Uploading $NAME_AAB"
+
+          curl -sS -X POST \
+            -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
+            -F "attachment=@${AAB}" \
+            -F "name=${NAME_AAB}" \
+            "${GITEA_BASE_URL}/api/v1/repos/${{ github.repository }}/releases/${RELEASE_ID}/assets" \
+            >/dev/null

README.md

@@ -1,16 +1,67 @@
-# mileograph_flutter
+# Mileograph (Flutter)
 
-A new Flutter project.
+Mileograph is a Flutter client for logging and analysing railway journeys. It lets you record legs, group them into trips, track locomotive mileage, and view stats and leaderboards.
 
-## Getting Started
+## Features
+- Add and edit journey legs with traction, timings, routes, notes, and delays.
+- Group legs into trips and see mileage totals and traction stats.
+- Browse traction, view loco details, mileage leaderboards, timelines, and legs.
+- Dashboard with homepage stats, “On This Day”, recent traction changes, and trips.
+- Profile badges, class clearance progress, and traction progress.
+- Offline-friendly UI built with Provider, GoRouter, and Material 3 styling.
 
-This project is a starting point for a Flutter application.
+## Project layout
+- `lib/objects/objects.dart` — shared model classes and helpers.
+- `lib/services/` — API, data loading, auth, endpoints, distance units.
+- `lib/components/` — UI pages and widgets (entries, traction, dashboard, trips, settings, etc.).
+- `assets/` — icons/fonts and other bundled assets.
 
-A few resources to get you started if this is your first Flutter project:
+## Prerequisites
+- Flutter SDK (3.x or later recommended).
+- Dart SDK (bundled with Flutter).
+- A Mileograph API endpoint (set in Settings within the app).
 
-- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab)
+## Setup
-- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook)
+1) Install Flutter: follow https://docs.flutter.dev/get-started/install and ensure `flutter doctor` is green.  
+2) Get dependencies:  
+   ```bash
+   flutter pub get
+   ```
+3) Configure an API endpoint:
+   - Run the app, open Settings, and set the base URL for your Mileograph backend.
+   - The app probes the endpoint for a version string before saving.
 
-For help getting started with Flutter development, view the
+## Running
-[online documentation](https://docs.flutter.dev/), which offers tutorials,
+- Debug (mobile/web depending on your toolchain):  
-samples, guidance on mobile development, and a full API reference.
+  ```bash
+  flutter run
+  ```
+- Release build (example for Android):  
+  ```bash
+  flutter build apk --release
+  ```
+
+## Testing and linting
+- Static analysis: `flutter analyze`
+- Unit/widget tests (if present): `flutter test`
+
+## Contributing
+1) Fork or branch from `main`.  
+2) Make changes with clear, small commits.  
+3) Add tests where feasible and keep `flutter analyze` clean.  
+4) Submit a PR describing:
+   - What changed and why.
+   - How to test or reproduce.
+   - Any API or migration notes.
+
+### Coding conventions
+- Prefer stateless widgets where possible; keep state localized.
+- Use existing services in `lib/services` for API access; add new endpoints there.
+- Keep models in `objects.dart` (or nearby files) and use helper parsers for defensive JSON handling.
+- Follow Material theming already in use; keep strings user-facing and concise.
+
+### Issue reporting
+Include device/OS, Flutter version (`flutter --version`), steps to reproduce, expected vs. actual behaviour, and logs if available.
+
+## License
+Copyright © Mileograph contributors. See repository terms if provided.

android/app/build.gradle.kts

@@ -1,3 +1,4 @@
+import java.io.File
 import java.util.Properties
 
 plugins {
@@ -22,8 +23,21 @@ val releaseKeyAlias = System.getenv("ANDROID_KEY_ALIAS")
 val releaseKeyPassword = System.getenv("ANDROID_KEY_PASSWORD")
     ?: keystoreProperties.getProperty("keyPassword")
 
+val releaseStoreFilePath: File? = releaseStoreFile?.let { path ->
+    val candidate = File(path)
+    if (candidate.isAbsolute) return@let candidate
+
+    val candidates = listOfNotNull(
+        rootProject.file(path),
+        rootProject.projectDir.parentFile?.let { File(it, path) },
+        project.file(path),
+    )
+
+    candidates.firstOrNull { it.exists() }
+}
+
 val hasReleaseKeystore = listOf(
-    releaseStoreFile,
+    releaseStoreFilePath?.path,
     releaseStorePassword,
     releaseKeyAlias,
     releaseKeyPassword
@@ -31,7 +45,7 @@ val hasReleaseKeystore = listOf(
 
 android {
     namespace = "com.example.mileograph_flutter"
-    compileSdk = flutter.compileSdkVersion
+    compileSdk = 36
     ndkVersion = "27.0.12077973"
 
     compileOptions {
@@ -48,8 +62,8 @@ android {
         applicationId = "com.petegregoryy.mileograph_flutter"
         // You can update the following values to match your application needs.
         // For more information, see: https://flutter.dev/to/review-gradle-config.
-        minSdk = flutter.minSdkVersion
+        minSdk = 24
-        targetSdk = flutter.targetSdkVersion
+        targetSdk = 36
         versionCode = flutter.versionCode
         versionName = flutter.versionName
     }
@@ -57,7 +71,7 @@ android {
     signingConfigs {
         if (hasReleaseKeystore) {
             create("release") {
-                storeFile = file(releaseStoreFile!!)
+                storeFile = releaseStoreFilePath
                 storePassword = releaseStorePassword
                 keyAlias = releaseKeyAlias!!
                 keyPassword = releaseKeyPassword

lib/components/calculator/calculator.dart

@@ -366,6 +366,16 @@ class _RouteCalculatorState extends State<RouteCalculator> {
             spacing: 12,
             runSpacing: 8,
             children: [
+              ElevatedButton.icon(
+                icon: const Icon(Icons.swap_horiz),
+                label: const Text('Reverse route'),
+                onPressed: () async {
+                  setState(() {
+                    data.stations = data.stations.reversed.toList();
+                  });
+                  await _calculateRoute(data.stations);
+                },
+              ),
               ElevatedButton.icon(
                 icon: const Icon(Icons.add),
                 label: const Text('Add Station'),

lib/components/dashboard/leaderboard_panel.dart

@@ -1,19 +1,31 @@
 import 'package:flutter/material.dart';
 import 'package:mileograph_flutter/services/data_service.dart';
 import 'package:mileograph_flutter/services/distance_unit_service.dart';
-
 import 'package:provider/provider.dart';
+enum _LeaderboardScope { global, friends }
 
-class LeaderboardPanel extends StatelessWidget {
+class LeaderboardPanel extends StatefulWidget {
   const LeaderboardPanel({super.key});
 
+  @override
+  State<LeaderboardPanel> createState() => _LeaderboardPanelState();
+}
+
+class _LeaderboardPanelState extends State<LeaderboardPanel> {
+  _LeaderboardScope _scope = _LeaderboardScope.global;
+
   @override
   Widget build(BuildContext context) {
     final data = context.watch<DataService>();
     final distanceUnits = context.watch<DistanceUnitService>();
-    final leaderboard = data.homepageStats?.leaderboard ?? [];
+    final leaderboard = _scope == _LeaderboardScope.global
+        ? (data.homepageStats?.leaderboard ?? [])
+        : data.friendsLeaderboard;
+    final loading = _scope == _LeaderboardScope.global
+        ? data.isHomepageLoading
+        : data.isFriendsLeaderboardLoading;
     final textTheme = Theme.of(context).textTheme;
-    if (data.isHomepageLoading && leaderboard.isEmpty) {
+    if (loading && leaderboard.isEmpty) {
       return const Padding(
         padding: EdgeInsets.all(16.0),
         child: Center(child: CircularProgressIndicator()),
@@ -51,6 +63,38 @@ class LeaderboardPanel extends StatelessWidget {
                       style: textTheme.labelSmall,
                     ),
                   ),
+                const SizedBox(width: 8),
+                SegmentedButton<_LeaderboardScope>(
+                  segments: const [
+                    ButtonSegment(
+                      value: _LeaderboardScope.global,
+                      label: Text('Global'),
+                    ),
+                    ButtonSegment(
+                      value: _LeaderboardScope.friends,
+                      label: Text('Friends'),
+                    ),
+                  ],
+                  selected: {_scope},
+                  onSelectionChanged: (vals) async {
+                    if (vals.isEmpty) return;
+                    final selected = vals.first;
+                    setState(() => _scope = selected);
+                    if (selected == _LeaderboardScope.friends &&
+                        data.friendsLeaderboard.isEmpty &&
+                        !data.isFriendsLeaderboardLoading) {
+                      await data.fetchFriendsLeaderboard();
+                    } else if (selected == _LeaderboardScope.global &&
+                        (data.homepageStats?.leaderboard.isEmpty ?? true) &&
+                        !data.isHomepageLoading) {
+                      await data.fetchHomepageStats();
+                    }
+                  },
+                  style: SegmentedButton.styleFrom(
+                    visualDensity: VisualDensity.compact,
+                    padding: const EdgeInsets.symmetric(horizontal: 8),
+                  ),
+                ),
               ],
             ),
             const SizedBox(height: 8),

lib/components/legs/leg_card.dart

@@ -27,10 +27,15 @@ class _LegCardState extends State<LegCard> {
   @override
   Widget build(BuildContext context) {
     final leg = widget.leg;
+    final isShared = leg.legShareId != null && leg.legShareId!.isNotEmpty;
     final distanceUnits = context.watch<DistanceUnitService>();
     final routeSegments = _parseRouteSegments(leg.route);
     final textTheme = Theme.of(context).textTheme;
     return Card(
+      clipBehavior: Clip.antiAlias,
+      elevation: 1,
+      child: Theme(
+        data: Theme.of(context).copyWith(dividerColor: Colors.transparent),
         child: ExpansionTile(
           onExpansionChanged: (v) => setState(() => _expanded = v),
           tilePadding: const EdgeInsets.symmetric(horizontal: 12, vertical: 4),
@@ -193,6 +198,17 @@ class _LegCardState extends State<LegCard> {
                 ],
               ],
             ),
+            if (isShared) ...[
+              const SizedBox(width: 8),
+              Tooltip(
+                message: 'Shared entry',
+                child: Icon(
+                  Icons.share,
+                  size: 18,
+                  color: Theme.of(context).colorScheme.primary,
+                ),
+              ),
+            ],
             if (widget.showEditButton) ...[
               const SizedBox(width: 8),
               IconButton(
@@ -256,6 +272,7 @@ class _LegCardState extends State<LegCard> {
             ),
           ],
         ),
+      ),
     );
   }
 

lib/components/login/login.dart

@@ -294,6 +294,7 @@ class _RegisterPanelContentState extends State<RegisterPanelContent> {
   final _passwordController = TextEditingController();
   final _inviteController = TextEditingController();
   bool _registering = false;
+  String? _usernameError;
 
   @override
   void dispose() {
@@ -306,10 +307,21 @@ class _RegisterPanelContentState extends State<RegisterPanelContent> {
   }
 
   Future<void> _register() async {
+    final username = _usernameController.text.trim();
+    if (username.contains(' ') || username.contains('@')) {
+      setState(() {
+        _usernameError = 'Username cannot contain spaces or @';
+      });
+      return;
+    } else {
+      setState(() {
+        _usernameError = null;
+      });
+    }
     setState(() => _registering = true);
     try {
       await widget.authService.register(
-        username: _usernameController.text.trim(),
+        username: username,
         email: _emailController.text.trim(),
         fullName: _displayNameController.text.trim(),
         password: _passwordController.text,
@@ -363,6 +375,21 @@ class _RegisterPanelContentState extends State<RegisterPanelContent> {
             border: OutlineInputBorder(),
             labelText: "Username",
           ),
+          onChanged: (_) {
+            if (_usernameError != null &&
+                !_usernameController.text.contains(' ') &&
+                !_usernameController.text.contains('@')) {
+              setState(() => _usernameError = null);
+            }
+          },
+        ),
+        if (_usernameError != null)
+          Padding(
+            padding: const EdgeInsets.only(top: 4.0),
+            child: Text(
+              _usernameError!,
+              style: TextStyle(color: Theme.of(context).colorScheme.error),
+            ),
           ),
         const SizedBox(height: 8),
         TextField(

lib/components/pages/badges.dart

@@ -0,0 +1,705 @@
+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 BadgesPage extends StatefulWidget {
+  const BadgesPage({super.key});
+
+  @override
+  State<BadgesPage> createState() => _BadgesPageState();
+}
+
+class _BadgesPageState extends State<BadgesPage> {
+  bool _initialised = false;
+  final Map<String, bool> _groupExpanded = {};
+  bool _loadingAwards = false;
+  bool _loadingClassProgress = false;
+  bool _loadingLocoProgress = false;
+
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    if (_initialised) return;
+    _initialised = true;
+    _refreshAwards();
+  }
+
+  Future<void> _refreshAwards() {
+    _loadingAwards = false;
+    _loadingClassProgress = false;
+    _loadingLocoProgress = false;
+    final data = context.read<DataService>();
+    return Future.wait([
+      data.fetchBadgeAwards(limit: 20, badgeCode: 'class_clearance'),
+      data.fetchClassClearanceProgress(),
+      data.fetchLocoClearanceProgress(),
+    ]);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final data = context.watch<DataService>();
+    final awards = data.badgeAwards;
+    final loading = data.isBadgeAwardsLoading;
+    final classProgress = data.classClearanceProgress;
+    final classProgressLoading =
+        data.isClassClearanceProgressLoading || _loadingClassProgress;
+    final locoProgress = data.locoClearanceProgress;
+    final locoProgressLoading =
+        data.isLocoClearanceProgressLoading || _loadingLocoProgress;
+    final hasAnyData =
+        awards.isNotEmpty || classProgress.isNotEmpty || locoProgress.isNotEmpty;
+
+    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 || classProgressLoading || locoProgressLoading) &&
+                !hasAnyData)
+              const Center(
+                child: Padding(
+                  padding: EdgeInsets.symmetric(vertical: 24.0),
+                  child: CircularProgressIndicator(),
+                ),
+              )
+            else if (!hasAnyData)
+              const Padding(
+                padding: EdgeInsets.symmetric(vertical: 12.0),
+                child: Text('No badges awarded yet.'),
+              )
+            else
+              ..._buildGroupedAwards(
+                context,
+                awards,
+                classProgress,
+                locoProgress,
+                classProgressLoading,
+                locoProgressLoading,
+                data.classClearanceHasMore,
+                data.locoClearanceHasMore,
+                data.badgeAwardsHasMore,
+                loading,
+              ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  List<Widget> _buildGroupedAwards(
+    BuildContext context,
+    List<BadgeAward> awards,
+    List<ClassClearanceProgress> classProgress,
+    List<LocoClearanceProgress> locoProgress,
+    bool classProgressLoading,
+    bool locoProgressLoading,
+    bool classProgressHasMore,
+    bool locoProgressHasMore,
+    bool badgeAwardsHasMore,
+    bool badgeAwardsLoading,
+  ) {
+    final grouped = _groupAwards(awards);
+    if ((classProgress.isNotEmpty || classProgressLoading) &&
+        !grouped.containsKey('class_clearance')) {
+      grouped['class_clearance'] = [];
+    }
+    if ((locoProgress.isNotEmpty || locoProgressLoading) &&
+        !grouped.containsKey('loco_clearance')) {
+      grouped['loco_clearance'] = [];
+    }
+    final codes = _orderedBadgeCodes(grouped.keys.toList());
+
+    return codes.map((code) {
+      final items = grouped[code]!;
+      final expanded = _groupExpanded[code] ?? true;
+      final title = _formatBadgeName(code);
+      final isClass = code == 'class_clearance';
+      final isLoco = code == 'loco_clearance';
+      final classItems = isClass ? classProgress : <ClassClearanceProgress>[];
+      final locoItems = isLoco ? locoProgress : <LocoClearanceProgress>[];
+      final awardCount = isLoco
+          ? locoItems.where((item) => item.awardedTiers.isNotEmpty).length
+          : items.length;
+      final isLoadingSection = isClass
+          ? (classProgressLoading || badgeAwardsLoading || _loadingAwards)
+          : (isLoco ? locoProgressLoading : false);
+
+      final children = <Widget>[];
+
+      if (isClass && items.isNotEmpty) {
+        children.add(_buildSubheading(context, 'Awarded'));
+        children.addAll(
+          items.map(
+            (award) => Padding(
+              padding:
+                  const EdgeInsets.symmetric(horizontal: 12.0, vertical: 4.0),
+              child: _buildAwardCard(context, award, compact: true),
+            ),
+          ),
+        );
+        if (badgeAwardsHasMore || badgeAwardsLoading || _loadingAwards) {
+          children.add(
+            Padding(
+              padding: const EdgeInsets.only(top: 4.0, bottom: 8.0),
+              child: _buildLoadMoreButton(
+                context,
+                badgeAwardsLoading || _loadingAwards,
+                () => _loadMoreAwards(),
+              ),
+            ),
+          );
+        }
+      } else if (!isClass && !isLoco && items.isNotEmpty) {
+        children.add(_buildSubheading(context, 'Awarded'));
+        children.addAll(
+          items.map(
+            (award) => Padding(
+              padding:
+                  const EdgeInsets.symmetric(horizontal: 12.0, vertical: 4.0),
+              child: _buildAwardCard(context, award, compact: true),
+            ),
+          ),
+        );
+      }
+
+      if (isClass) {
+        children.addAll(
+          _buildClassProgressSection(
+            context,
+            classItems,
+            classProgressLoading,
+            classProgressHasMore,
+          ),
+        );
+      }
+      if (isLoco) {
+        children.addAll(
+          _buildLocoProgressSection(
+            context,
+            locoItems,
+            locoProgressLoading,
+            locoProgressHasMore,
+            showHeading: false,
+          ),
+        );
+      }
+
+      if (children.isEmpty && !isLoadingSection) {
+        children.add(
+          const Padding(
+            padding: EdgeInsets.symmetric(vertical: 6.0),
+            child: Text('No awards'),
+          ),
+        );
+      }
+
+      return Card(
+        margin: const EdgeInsets.symmetric(vertical: 4.0),
+        child: ExpansionTile(
+          key: ValueKey(code),
+          tilePadding: const EdgeInsets.symmetric(horizontal: 12.0),
+          title: Row(
+            children: [
+              Expanded(child: Text(title)),
+              if (isLoadingSection) ...[
+                const SizedBox(width: 8),
+                const SizedBox(
+                  height: 18,
+                  width: 18,
+                  child: CircularProgressIndicator(strokeWidth: 2),
+                ),
+              ],
+              const SizedBox(width: 8),
+              _buildCountChip(context, awardCount),
+            ],
+          ),
+          initiallyExpanded: expanded,
+          onExpansionChanged: (isOpen) {
+            setState(() => _groupExpanded[code] = isOpen);
+          },
+          children: children,
+        ),
+      );
+    }).toList();
+  }
+
+  Map<String, List<BadgeAward>> _groupAwards(List<BadgeAward> awards) {
+    final Map<String, List<BadgeAward>> grouped = {};
+    for (final award in awards) {
+      final code = award.badgeCode.toLowerCase();
+      grouped.putIfAbsent(code, () => []).add(award);
+    }
+    return grouped;
+  }
+
+  Widget _buildAwardCard(
+    BuildContext context,
+    BadgeAward award, {
+    bool compact = false,
+  }) {
+    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);
+
+    final content = 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: 4),
+          Text(
+            scope,
+            style: Theme.of(context).textTheme.bodyMedium,
+          ),
+        ],
+        if (award.loco != null) ...[
+          const SizedBox(height: 6),
+          _buildLocoInfo(context, award.loco!),
+        ],
+      ],
+    );
+
+    if (compact) {
+      return content;
+    }
+
+    return Card(
+      child: Padding(
+        padding: const EdgeInsets.all(10.0),
+        child: content,
+      ),
+    );
+  }
+
+  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(' ');
+  }
+
+  List<String> _orderedBadgeCodes(List<String> codes) {
+    final lowerCodes = codes.map((c) => c.toLowerCase()).toSet();
+    final ordered = <String>[];
+    for (final code in ['loco_clearance', 'class_clearance']) {
+      if (lowerCodes.remove(code)) ordered.add(code);
+    }
+    final remaining = lowerCodes.toList()
+      ..sort((a, b) => _formatBadgeName(a).compareTo(_formatBadgeName(b)));
+    ordered.addAll(remaining);
+    return ordered;
+  }
+
+  Widget _buildSubheading(BuildContext context, String label) {
+    return Padding(
+      padding: const EdgeInsets.fromLTRB(16, 8, 16, 4),
+      child: Text(
+        label,
+        style: Theme.of(context)
+            .textTheme
+            .labelMedium
+            ?.copyWith(fontWeight: FontWeight.w700),
+      ),
+    );
+  }
+
+  List<Widget> _buildClassProgressSection(
+    BuildContext context,
+    List<ClassClearanceProgress> progress,
+    bool isLoading,
+    bool hasMore,
+  ) {
+    if (progress.isEmpty && !isLoading && !hasMore) return const [];
+    return [
+      _buildSubheading(context, 'In Progress'),
+      ...progress.map(
+        (item) => Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 6.0),
+          child: _buildClassProgressCard(context, item),
+        ),
+      ),
+      if (hasMore || isLoading)
+        Padding(
+          padding: const EdgeInsets.only(top: 4.0, bottom: 8.0),
+          child: _buildLoadMoreButton(
+            context,
+            isLoading,
+            () => _loadMoreClassProgress(),
+          ),
+        ),
+      if (progress.isNotEmpty) const SizedBox(height: 4),
+    ];
+  }
+
+  List<Widget> _buildLocoProgressSection(
+    BuildContext context,
+    List<LocoClearanceProgress> progress,
+    bool isLoading,
+    bool hasMore,
+    {bool showHeading = true}
+  ) {
+    if (progress.isEmpty && !isLoading && !hasMore) return const [];
+    return [
+      if (showHeading) _buildSubheading(context, 'In Progress'),
+      if (progress.isEmpty && isLoading)
+        Padding(
+          padding: const EdgeInsets.symmetric(vertical: 12.0),
+          child: _buildLoadingIndicator(),
+        ),
+      ...progress.map(
+        (item) => Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 12.0, vertical: 6.0),
+          child: _buildLocoProgressCard(context, item),
+        ),
+      ),
+      if (hasMore || isLoading)
+        Padding(
+          padding: const EdgeInsets.only(top: 4.0, bottom: 8.0),
+          child: _buildLoadMoreButton(
+            context,
+            isLoading,
+            () => _loadMoreLocoProgress(),
+          ),
+        ),
+      if (progress.isNotEmpty) const SizedBox(height: 4),
+    ];
+  }
+
+  Widget _buildClassProgressCard(
+    BuildContext context,
+    ClassClearanceProgress progress,
+  ) {
+    final pct = progress.percentComplete.clamp(0, 100);
+    return Card(
+      margin: const EdgeInsets.symmetric(vertical: 4.0),
+      child: Padding(
+        padding: const EdgeInsets.all(8.0),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              children: [
+                Expanded(
+                  child: Text(
+                    progress.className,
+                    style: Theme.of(context).textTheme.bodyMedium,
+                  ),
+                ),
+                Text(
+                  '${pct.toStringAsFixed(0)}%',
+                  style: Theme.of(context).textTheme.labelMedium,
+                ),
+              ],
+            ),
+            const SizedBox(height: 4),
+            LinearProgressIndicator(
+              value: progress.total == 0 ? 0 : pct / 100,
+              minHeight: 6,
+            ),
+            if (progress.total > 0)
+              Padding(
+                padding: const EdgeInsets.only(top: 2.0),
+                child: Text(
+                  '${progress.completed}/${progress.total}',
+                  style: Theme.of(context)
+                      .textTheme
+                      .labelSmall
+                      ?.copyWith(color: Theme.of(context).hintColor),
+                ),
+              ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildLocoProgressCard(
+    BuildContext context,
+    LocoClearanceProgress progress,
+  ) {
+    final tierIcons = progress.awardedTiers
+        .map((tier) => _buildTierIcon(tier, size: 18))
+        .whereType<Widget>()
+        .toList();
+    final reachedTopTier = progress.nextTier.isEmpty;
+    final pct = progress.percent.clamp(0, 100);
+    final nextTier = progress.nextTier.isNotEmpty
+        ? progress.nextTier[0].toUpperCase() + progress.nextTier.substring(1)
+        : 'Next';
+    final loco = progress.loco;
+    final title = [
+      if (loco.number.isNotEmpty) loco.number,
+      if (loco.locoClass.isNotEmpty) loco.locoClass,
+    ].join(' • ');
+    return Card(
+      margin: const EdgeInsets.symmetric(vertical: 4.0),
+      child: Padding(
+        padding: const EdgeInsets.all(10.0),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              children: [
+                Expanded(
+                  child: Text(
+                    title.isNotEmpty ? title : 'Loco',
+                    style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                          fontWeight: FontWeight.w700,
+                        ),
+                  ),
+                ),
+                if (tierIcons.isNotEmpty)
+                  Row(
+                    children: tierIcons
+                        .expand((icon) sync* {
+                          yield icon;
+                          yield const SizedBox(width: 4);
+                        })
+                        .toList()
+                      ..removeLast(),
+                  ),
+              ],
+            ),
+            if ((loco.name ?? '').isNotEmpty)
+              Padding(
+                padding: const EdgeInsets.only(top: 2.0),
+                child: Text(
+                  loco.name ?? '',
+                  style: Theme.of(context).textTheme.bodySmall,
+                ),
+              ),
+            if (!reachedTopTier) ...[
+              const SizedBox(height: 4),
+              LinearProgressIndicator(
+                value: progress.required == 0 ? 0 : pct / 100,
+                minHeight: 6,
+              ),
+              Padding(
+                padding: const EdgeInsets.only(top: 2.0),
+                child: Text(
+                  '${pct.toStringAsFixed(0)}% to $nextTier award',
+                  style: Theme.of(context).textTheme.bodyMedium,
+                ),
+              ),
+            ],
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildLoadMoreButton(
+    BuildContext context,
+    bool isLoading,
+    Future<void> Function() onPressed,
+  ) {
+    return Align(
+      alignment: Alignment.center,
+      child: OutlinedButton.icon(
+        onPressed: isLoading
+            ? null
+            : () {
+                onPressed();
+              },
+        icon: isLoading
+            ? const SizedBox(
+                height: 18,
+                width: 18,
+                child: CircularProgressIndicator(strokeWidth: 2),
+              )
+            : const Icon(Icons.expand_more),
+        label: Text(isLoading ? 'Loading...' : 'Load more'),
+      ),
+    );
+  }
+
+  Widget _buildLoadingIndicator() {
+    return const Center(
+      child: SizedBox(
+        height: 24,
+        width: 24,
+        child: CircularProgressIndicator(strokeWidth: 2),
+      ),
+    );
+  }
+
+  Widget _buildCountChip(BuildContext context, int count) {
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 6),
+      decoration: BoxDecoration(
+        color: Theme.of(context).colorScheme.surfaceContainerHighest,
+        borderRadius: BorderRadius.circular(999),
+      ),
+      child: Text(
+        '$count',
+        style: Theme.of(context)
+            .textTheme
+            .labelMedium
+            ?.copyWith(fontWeight: FontWeight.w700),
+      ),
+    );
+  }
+
+  Future<void> _loadMoreClassProgress() {
+    final data = context.read<DataService>();
+    if (data.isClassClearanceProgressLoading || _loadingClassProgress) {
+      return Future.value();
+    }
+    setState(() => _loadingClassProgress = true);
+    return data
+        .fetchClassClearanceProgress(
+          offset: data.classClearanceProgress.length,
+          append: true,
+        )
+        .whenComplete(() {
+      if (mounted) setState(() => _loadingClassProgress = false);
+    });
+  }
+
+  Future<void> _loadMoreLocoProgress() {
+    final data = context.read<DataService>();
+    if (data.isLocoClearanceProgressLoading || _loadingLocoProgress) {
+      return Future.value();
+    }
+    setState(() => _loadingLocoProgress = true);
+    return data
+        .fetchLocoClearanceProgress(
+          offset: data.locoClearanceProgress.length,
+          append: true,
+        )
+        .whenComplete(() {
+      if (mounted) setState(() => _loadingLocoProgress = false);
+    });
+  }
+
+  Future<void> _loadMoreAwards() {
+    final data = context.read<DataService>();
+    if (data.isBadgeAwardsLoading || _loadingAwards) return Future.value();
+    setState(() => _loadingAwards = true);
+    return data
+        .fetchBadgeAwards(
+          offset: data.badgeAwards.length,
+          append: true,
+          badgeCode: 'class_clearance',
+          limit: 20,
+        )
+        .whenComplete(() {
+      if (mounted) setState(() => _loadingAwards = false);
+    });
+  }
+
+  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, {double size = 24}) {
+    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, size: size);
+  }
+
+  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/dashboard.dart

@@ -27,7 +27,7 @@ class _DashboardState extends State<Dashboard> {
     final distanceUnits = context.watch<DistanceUnitService>();
     final stats = data.homepageStats;
 
-    final isInitialLoading = data.isHomepageLoading || stats == null;
+    final isInitialLoading = data.isHomepageLoading && stats == null;
 
     return RefreshIndicator(
       onRefresh: () async {
@@ -513,9 +513,9 @@ class _DashboardState extends State<Dashboard> {
   Widget _buildTripsCard(
       BuildContext context, DataService data, DistanceUnitService distanceUnits) {
     final tripsUnsorted = data.trips;
-    List trips = [];
+    List<TripSummary> trips = [];
     if (tripsUnsorted.isNotEmpty) {
-      trips = [...tripsUnsorted]..sort((a, b) => b.tripId.compareTo(a.tripId));
+      trips = [...tripsUnsorted]..sort(TripSummary.compareByDateDesc);
     }
     return _panel(
       context,

lib/components/pages/more.dart

@@ -1,81 +1,13 @@
 import 'package:flutter/material.dart';
-import 'package:mileograph_flutter/components/pages/profile.dart';
+import 'package:mileograph_flutter/components/pages/more/more_home_page.dart';
-import 'package:mileograph_flutter/components/pages/settings.dart';
+
-import 'package:mileograph_flutter/components/pages/stats.dart';
+export 'more/admin_page.dart';
 
 class MorePage extends StatelessWidget {
   const MorePage({super.key});
 
   @override
   Widget build(BuildContext context) {
-    return Navigator(
+    return const MoreHomePage();
-      onGenerateRoute: (settings) {
-        final name = settings.name ?? '/';
-        Widget page;
-        switch (name) {
-          case '/settings':
-            page = const SettingsPage();
-            break;
-          case '/profile':
-            page = const ProfilePage();
-            break;
-          case '/stats':
-            page = const StatsPage();
-            break;
-          case '/more/settings':
-            page = const SettingsPage();
-            break;
-          case '/more/profile':
-            page = const ProfilePage();
-            break;
-          case '/more/stats':
-            page = const StatsPage();
-            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.bar_chart),
-                title: const Text('Stats'),
-                onTap: () => Navigator.of(context).pushNamed('/more/stats'),
-              ),
-              const Divider(height: 1),
-              ListTile(
-                leading: const Icon(Icons.settings),
-                title: const Text('Settings'),
-                onTap: () => Navigator.of(context).pushNamed('/more/settings'),
-              ),
-            ],
-          ),
-        ),
-      ],
-    );
   }
 }

lib/components/pages/more/admin_page.dart

@@ -0,0 +1,476 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import 'package:mileograph_flutter/objects/objects.dart';
+import 'package:mileograph_flutter/services/api_service.dart';
+import 'package:mileograph_flutter/services/authservice.dart';
+
+class AdminPage extends StatefulWidget {
+  const AdminPage({super.key});
+
+  @override
+  State<AdminPage> createState() => _AdminPageState();
+}
+
+class _AdminPageState extends State<AdminPage> {
+  final TextEditingController _titleController = TextEditingController();
+  final TextEditingController _bodyController = TextEditingController();
+
+  final List<UserSummary> _selectedUsers = [];
+  List<UserSummary> _userOptions = [];
+
+  List<String> _channels = [];
+  String? _selectedChannel;
+  String? _channelError;
+  bool _loadingChannels = false;
+
+  String? _userError;
+
+  bool _sending = false;
+
+  @override
+  void initState() {
+    super.initState();
+    _loadChannels();
+  }
+
+  @override
+  void dispose() {
+    _titleController.dispose();
+    _bodyController.dispose();
+    super.dispose();
+  }
+
+  Future<void> _loadChannels() async {
+    setState(() {
+      _loadingChannels = true;
+      _channelError = null;
+    });
+    try {
+      final api = context.read<ApiService>();
+      final json = await api.get('/notifications/channels');
+      List<dynamic>? list;
+      if (json is List) {
+        list = json;
+      } else if (json is Map) {
+        for (final key in ['channels', 'data']) {
+          final value = json[key];
+          if (value is List) {
+            list = value;
+            break;
+          }
+        }
+      }
+      final parsed =
+          list?.map((e) => e.toString()).where((e) => e.isNotEmpty).toList() ??
+              const [];
+      setState(() {
+        _channels = parsed;
+        _selectedChannel = parsed.isNotEmpty ? parsed.first : null;
+      });
+    } catch (e) {
+      setState(() {
+        _channelError = 'Failed to load channels';
+      });
+    } finally {
+      if (mounted) setState(() => _loadingChannels = false);
+    }
+  }
+
+  Future<List<UserSummary>> _fetchUserSuggestions(
+    ApiService api,
+    String query,
+  ) async {
+    final encoded = Uri.encodeComponent(query);
+    final candidates = [
+      '/users/search?q=$encoded',
+      '/users/search?query=$encoded',
+      '/users?search=$encoded',
+    ];
+    for (final path in candidates) {
+      try {
+        final json = await api.get(path);
+        List<dynamic>? list;
+        if (json is List) {
+          list = json;
+        } else if (json is Map) {
+          for (final key in ['users', 'data', 'results', 'items']) {
+            final value = json[key];
+            if (value is List) {
+              list = value;
+              break;
+            }
+          }
+        }
+        if (list != null) {
+          return list
+              .whereType<Map>()
+              .map((e) => UserSummary.fromJson(
+                    e.map((k, v) => MapEntry(k.toString(), v)),
+                  ))
+              .toList();
+        }
+      } catch (_) {
+        // Try next endpoint
+      }
+    }
+    return const [];
+  }
+
+  void _removeUser(UserSummary user) {
+    setState(() {
+      _selectedUsers.removeWhere((u) => u.userId == user.userId);
+    });
+  }
+
+  Future<void> _openUserPicker() async {
+    final api = context.read<ApiService>();
+    var tempSelected = List<UserSummary>.from(_selectedUsers);
+    var options = List<UserSummary>.from(_userOptions);
+    String query = '';
+    bool loading = false;
+    String? error = _userError;
+
+    Future<void> runSearch(String q, void Function(void Function()) setModalState) async {
+      setModalState(() {
+        query = q;
+        loading = true;
+        error = null;
+      });
+      try {
+        final results = await _fetchUserSuggestions(api, q);
+        setModalState(() {
+          options = results;
+          loading = false;
+          error = null;
+        });
+        if (mounted) {
+          setState(() {
+            _userOptions = results;
+            _userError = null;
+          });
+        }
+      } catch (e) {
+        setModalState(() {
+          loading = false;
+          error = 'Failed to search users';
+        });
+        if (mounted) {
+          setState(() {
+            _userError = 'Failed to search users';
+          });
+        }
+      }
+    }
+
+    var initialFetchTriggered = false;
+
+    await showModalBottomSheet<void>(
+      context: context,
+      isScrollControlled: true,
+      builder: (ctx) {
+        return StatefulBuilder(
+          builder: (ctx, setModalState) {
+            if (!initialFetchTriggered && !loading && options.isEmpty) {
+              initialFetchTriggered = true;
+              WidgetsBinding.instance.addPostFrameCallback(
+                (_) => runSearch('', setModalState),
+              );
+            }
+            final lowerQuery = query.toLowerCase();
+            final filtered = lowerQuery.isEmpty
+                ? options
+                : options.where((u) {
+                    return u.displayName.toLowerCase().contains(lowerQuery) ||
+                        u.username.toLowerCase().contains(lowerQuery) ||
+                        u.email.toLowerCase().contains(lowerQuery);
+                  }).toList();
+            return SafeArea(
+              child: Padding(
+                padding: EdgeInsets.only(
+                  left: 16,
+                  right: 16,
+                  top: 16,
+                  bottom: MediaQuery.of(ctx).viewInsets.bottom + 16,
+                ),
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Row(
+                      children: [
+                        Text(
+                          'Select recipients',
+                          style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                                fontWeight: FontWeight.w700,
+                              ),
+                        ),
+                        const Spacer(),
+                        TextButton(
+                          onPressed: () {
+                            setModalState(() {
+                              tempSelected.clear();
+                            });
+                            setState(() => _selectedUsers.clear());
+                          },
+                          child: const Text('Clear'),
+                        ),
+                      ],
+                    ),
+                    const SizedBox(height: 8),
+                    TextField(
+                      decoration: const InputDecoration(
+                        labelText: 'Search users',
+                        border: OutlineInputBorder(),
+                      ),
+                      onChanged: (val) => runSearch(val, setModalState),
+                    ),
+                    if (loading)
+                      const Padding(
+                        padding: EdgeInsets.only(top: 8.0),
+                        child: LinearProgressIndicator(minHeight: 2),
+                      ),
+                    if (error != null)
+                      Padding(
+                        padding: const EdgeInsets.only(top: 8.0),
+                        child: Text(
+                          error!,
+                          style:
+                              TextStyle(color: Theme.of(context).colorScheme.error),
+                        ),
+                      ),
+                    const SizedBox(height: 12),
+                    SizedBox(
+                      height: 340,
+                      child: filtered.isEmpty
+                          ? const Center(child: Text('No users yet.'))
+                          : ListView.builder(
+                              itemCount: filtered.length,
+                              itemBuilder: (_, index) {
+                                final user = filtered[index];
+                                final selected =
+                                    tempSelected.any((u) => u.userId == user.userId);
+                                return CheckboxListTile(
+                                  value: selected,
+                                  title: Text(user.displayName),
+                                  subtitle: user.email.isNotEmpty
+                                      ? Text(user.email)
+                                      : (user.username.isNotEmpty
+                                          ? Text(user.username)
+                                          : null),
+                                  onChanged: (val) {
+                                    setModalState(() {
+                                      if (val == true) {
+                                        if (!tempSelected
+                                            .any((u) => u.userId == user.userId)) {
+                                          tempSelected.add(user);
+                                        }
+                                      } else {
+                                        tempSelected.removeWhere(
+                                            (u) => u.userId == user.userId);
+                                      }
+                                    });
+                                    if (mounted) {
+                                      setState(() {
+                                        _selectedUsers
+                                          ..clear()
+                                          ..addAll(tempSelected);
+                                      });
+                                    }
+                                  },
+                                );
+                              },
+                            ),
+                    ),
+                    const SizedBox(height: 8),
+                    Align(
+                      alignment: Alignment.centerRight,
+                      child: TextButton(
+                        onPressed: () => Navigator.of(ctx).pop(),
+                        child: const Text('Done'),
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            );
+          },
+        );
+      },
+    );
+  }
+
+  Future<void> _sendNotification() async {
+    final channel = _selectedChannel;
+    if (channel == null || channel.isEmpty) {
+      _showSnack('Select a channel first.');
+      return;
+    }
+    if (_selectedUsers.isEmpty) {
+      _showSnack('Select at least one user.');
+      return;
+    }
+    final title = _titleController.text.trim();
+    final body = _bodyController.text.trim();
+    if (title.isEmpty || body.isEmpty) {
+      _showSnack('Title and body are required.');
+      return;
+    }
+    setState(() => _sending = true);
+    try {
+      final api = context.read<ApiService>();
+      await api.post('/notifications/new', {
+        'user_ids': _selectedUsers.map((e) => e.userId).toList(),
+        'channel': channel,
+        'title': title,
+        'body': body,
+      });
+      if (!mounted) return;
+      _showSnack('Notification sent');
+      setState(() {
+        _selectedUsers.clear();
+        _titleController.clear();
+        _bodyController.clear();
+        _userOptions.clear();
+      });
+    } catch (e) {
+      _showSnack('Failed to send: $e');
+    } finally {
+      if (mounted) setState(() => _sending = false);
+    }
+  }
+
+  void _showSnack(String message) {
+    ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(message)));
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final isAdmin = context.select<AuthService, bool>((auth) => auth.isElevated);
+    if (!isAdmin) {
+      return const Scaffold(
+        body: Center(child: Text('You do not have access to this page.')),
+      );
+    }
+    return Scaffold(
+      appBar: AppBar(
+        title: const Text('Admin'),
+      ),
+      body: ListView(
+        padding: const EdgeInsets.all(16),
+        children: [
+          Text(
+            'Send notification',
+            style: Theme.of(context).textTheme.titleLarge?.copyWith(
+                  fontWeight: FontWeight.w700,
+                ),
+          ),
+          const SizedBox(height: 12),
+          _buildUserPicker(),
+          const SizedBox(height: 12),
+          DropdownButtonFormField<String>(
+            value: _selectedChannel,
+            decoration: const InputDecoration(
+              labelText: 'Channel',
+              border: OutlineInputBorder(),
+            ),
+            items: _channels
+                .map(
+                  (c) => DropdownMenuItem(
+                    value: c,
+                    child: Text(c),
+                  ),
+                )
+                .toList(),
+            onChanged:
+                _loadingChannels ? null : (val) => setState(() => _selectedChannel = val),
+          ),
+          if (_loadingChannels)
+            const Padding(
+              padding: EdgeInsets.only(top: 8.0),
+              child: LinearProgressIndicator(minHeight: 2),
+            ),
+          if (_channelError != null)
+            Padding(
+              padding: const EdgeInsets.only(top: 8.0),
+              child: Text(
+                _channelError!,
+                style: TextStyle(color: Theme.of(context).colorScheme.error),
+              ),
+            ),
+          const SizedBox(height: 12),
+          TextField(
+            controller: _titleController,
+            decoration: const InputDecoration(
+              labelText: 'Title',
+              border: OutlineInputBorder(),
+            ),
+          ),
+          const SizedBox(height: 12),
+          TextField(
+            controller: _bodyController,
+            minLines: 3,
+            maxLines: 6,
+            decoration: const InputDecoration(
+              labelText: 'Body',
+              border: OutlineInputBorder(),
+            ),
+          ),
+          const SizedBox(height: 16),
+          SizedBox(
+            width: double.infinity,
+            child: ElevatedButton.icon(
+              onPressed: _sending ? null : _sendNotification,
+              icon: _sending
+                  ? const SizedBox(
+                      width: 18,
+                      height: 18,
+                      child: CircularProgressIndicator(strokeWidth: 2),
+                    )
+                  : const Icon(Icons.send),
+              label: Text(_sending ? 'Sending...' : 'Send notification'),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildUserPicker() {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          'Recipients',
+          style: Theme.of(context).textTheme.titleMedium,
+        ),
+        const SizedBox(height: 8),
+        Wrap(
+          spacing: 8,
+          runSpacing: 8,
+          children: _selectedUsers
+              .map(
+                (u) => InputChip(
+                  label: Text(u.displayName),
+                  onDeleted: () => _removeUser(u),
+                ),
+              )
+              .toList(),
+        ),
+        const SizedBox(height: 8),
+        OutlinedButton.icon(
+          onPressed: _openUserPicker,
+          icon: const Icon(Icons.person_search),
+          label: const Text('Select users'),
+        ),
+        if (_userError != null)
+          Padding(
+            padding: const EdgeInsets.only(top: 8.0),
+            child: Text(
+              _userError!,
+              style: TextStyle(color: Theme.of(context).colorScheme.error),
+            ),
+          ),
+      ],
+    );
+  }
+}

lib/components/pages/more/more_home_page.dart

@@ -0,0 +1,59 @@
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import 'package:provider/provider.dart';
+import 'package:mileograph_flutter/services/authservice.dart';
+
+class MoreHomePage extends StatelessWidget {
+  const MoreHomePage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final isAdmin = context.select<AuthService, bool>((auth) => auth.isElevated);
+    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.person),
+                title: const Text('Profile'),
+                onTap: () => context.go('/more/profile'),
+              ),
+              const Divider(height: 1),
+              ListTile(
+                leading: const Icon(Icons.emoji_events),
+                title: const Text('Badges'),
+                onTap: () => context.go('/more/badges'),
+              ),
+              const Divider(height: 1),
+              ListTile(
+                leading: const Icon(Icons.bar_chart),
+                title: const Text('Stats'),
+                onTap: () => context.go('/more/stats'),
+              ),
+              const Divider(height: 1),
+              ListTile(
+                leading: const Icon(Icons.settings),
+                title: const Text('Settings'),
+                onTap: () => context.go('/more/settings'),
+              ),
+              if (isAdmin) const Divider(height: 1),
+              if (isAdmin)
+                ListTile(
+                  leading: const Icon(Icons.admin_panel_settings),
+                  title: const Text('Admin'),
+                  onTap: () => context.go('/more/admin'),
+                ),
+            ],
+          ),
+        ),
+      ],
+    );
+  }
+}

lib/components/pages/new_entry/new_entry.dart

@@ -10,6 +10,7 @@ import 'package:mileograph_flutter/components/calculator/calculator.dart';
 import 'package:mileograph_flutter/components/pages/traction.dart';
 import 'package:mileograph_flutter/objects/objects.dart';
 import 'package:mileograph_flutter/services/api_service.dart';
+import 'package:mileograph_flutter/services/authservice.dart';
 import 'package:mileograph_flutter/services/data_service.dart';
 import 'package:mileograph_flutter/services/distance_unit_service.dart';
 import 'package:mileograph_flutter/services/navigation_guard.dart';

lib/components/pages/new_entry/new_entry_draft_logic.dart

@@ -4,14 +4,24 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
   Future<bool> _handleExitIntent() async {
     if (!mounted) return false;
     if (_isEditing) return true;
+    if (_activeLegShare != null) return true;
     if (_formIsEmpty()) return true;
     if (_activeDraftId != null && !_draftChangedFromBaseline()) {
       return true;
     }
+    final currentSnapshot = _currentSubmissionSnapshot();
+    if (_lastSubmittedSnapshot != null &&
+        _snapshotEquality.equals(_lastSubmittedSnapshot, currentSnapshot)) {
+      return true;
+    }
     final choice = await _promptSaveDraft();
     if (choice == _ExitChoice.cancel) return false;
     if (choice == _ExitChoice.save) {
+      try {
         await _saveDraftEntry(draftId: _activeDraftId);
+      } catch (_) {
+        return true;
+      }
     } else if (choice == _ExitChoice.discard) {
       // Delay reset to avoid setState during the dialog/build phase.
       await Future<void>.delayed(Duration.zero);
@@ -53,6 +63,7 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
 
   Future<_ExitChoice> _promptSaveDraft() async {
     if (!mounted) return _ExitChoice.cancel;
+    try {
       final result = await showDialog<_ExitChoice>(
         context: context,
         barrierDismissible: false,
@@ -78,10 +89,15 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
           ],
         ),
       );
+      if (!mounted) return _ExitChoice.cancel;
       return result ?? _ExitChoice.cancel;
+    } catch (_) {
+      return _ExitChoice.cancel;
+    }
   }
 
   Future<void> _openDrafts() async {
+    if (_activeLegShare != null) return;
     final selected = await Navigator.of(context).push<_StoredDraft>(
       MaterialPageRoute(
         builder: (_) => _DraftListPage(
@@ -97,6 +113,7 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
   }
 
   Future<void> _saveDraftManually() async {
+    if (_activeLegShare != null) return;
     if (_savingDraft) return;
     if (_formIsEmpty()) {
       ScaffoldMessenger.maybeOf(context)?.showSnackBar(
@@ -123,7 +140,9 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
   }
 
   Future<void> _saveDraft() async {
-    if (_restoringDraft || !_draftPersistenceEnabled) return;
+    if (_restoringDraft || !_draftPersistenceEnabled || _activeLegShare != null) {
+      return;
+    }
     final prefs = await SharedPreferences.getInstance();
     final draft = {
       "date": _selectedDate.toIso8601String(),
@@ -169,6 +188,14 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
               "distance": _routeResult!.distance,
             },
       "tractionItems": _serializeTractionItems(),
+      "shareUserIds": _shareUserIds.toList(),
+      "shareUsers": _shareUsers
+          .map((u) => {
+                "user_id": u.userId,
+                "username": u.username,
+                "full_name": u.fullName,
+              })
+          .toList(),
     };
     await prefs.setString(_kDraftPrefsKey, jsonEncode(draft));
   }
@@ -444,6 +471,19 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
           ..clear()
           ..add(_TractionItem.marker());
       }
+      final shareIdsRaw = data['shareUserIds'];
+      final shareUsersRaw = data['shareUsers'];
+      _shareUserIds = shareIdsRaw is List
+          ? shareIdsRaw.map((e) => e.toString()).toSet()
+          : {};
+      _shareUsers = shareUsersRaw is List
+          ? shareUsersRaw
+              .whereType<Map>()
+              .map((e) => UserSummary.fromJson(
+                    e.map((k, v) => MapEntry(k.toString(), v)),
+                  ))
+              .toList()
+          : [];
       _lastSubmittedSnapshot = null;
       final idRaw = data['id'];
       if (idRaw != null) {

lib/components/pages/new_entry/new_entry_page.dart

@@ -1,9 +1,10 @@
 part of 'new_entry.dart';
 
 class NewEntryPage extends StatefulWidget {
-  const NewEntryPage({super.key, this.editLegId});
+  const NewEntryPage({super.key, this.editLegId, this.legShare});
 
   final int? editLegId;
+  final LegShareData? legShare;
 
   @override
   State<NewEntryPage> createState() => _NewEntryPageState();
@@ -52,9 +53,16 @@ class _NewEntryPageState extends State<NewEntryPage> {
       const DeepCollectionEquality();
   String? _activeDraftId;
   DistanceUnit? _lastDistanceUnit;
+  Set<String> _shareUserIds = {};
+  List<UserSummary> _shareUsers = [];
+  LegShareData? _activeLegShare;
+  String? _sharedFromUser;
+  int? _shareNotificationId;
+  bool _routeReversedFlag = false;
 
   bool get _isEditing => widget.editLegId != null;
   bool get _draftPersistenceEnabled =>
+      _activeLegShare == null &&
       false; // legacy single draft disabled in favor of draft list
 
   @override
@@ -69,16 +77,28 @@ class _NewEntryPageState extends State<NewEntryPage> {
       data.fetchClassList();
       data.fetchTripOptions();
       _loadStations();
-      if (_draftPersistenceEnabled) {
+      if (_draftPersistenceEnabled && widget.legShare == null) {
         _loadDraft();
       }
       _loadStations();
       if (_isEditing && widget.editLegId != null) {
         _loadLegForEdit(widget.editLegId!);
+      } else if (widget.legShare != null) {
+        _applyLegShare(widget.legShare!);
       }
     });
   }
 
+  @override
+  void didUpdateWidget(covariant NewEntryPage oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (widget.legShare != null &&
+        (oldWidget.legShare == null ||
+            widget.legShare!.id != oldWidget.legShare!.id)) {
+      _applyLegShare(widget.legShare!);
+    }
+  }
+
   @override
   void dispose() {
     NavigationGuard.unregister(_exitGuard);
@@ -128,12 +148,330 @@ class _NewEntryPageState extends State<NewEntryPage> {
     }
   }
 
+  void _reverseRouteAndEndpoints() {
+    setState(() {
+      // Swap start/end and origin/destination fields
+      final startText = _startController.text;
+      final endText = _endController.text;
+      _startController.text = endText;
+      _endController.text = startText;
+
+      final originText = _originController.text;
+      final destText = _destinationController.text;
+      _originController.text = destText;
+      _destinationController.text = originText;
+
+      // Reverse route result if present
+      if (_routeResult != null) {
+        final reversedInput = _routeResult!.inputRoute.reversed.toList();
+        final reversedCalc = _routeResult!.calculatedRoute.reversed.toList();
+        final reversedCosts = _routeResult!.costs.reversed.toList();
+        _routeResult = RouteResult(
+          inputRoute: reversedInput,
+          calculatedRoute: reversedCalc,
+          costs: reversedCosts,
+          distance: _routeResult!.distance,
+        );
+        final units = _distanceUnits(context);
+        _mileageController.text = _formatDistance(
+          units,
+          _routeResult!.distance,
+          decimals: 2,
+          includeUnit: false,
+        );
+        _useManualMileage = false;
+      } else if (_useManualMileage &&
+          _mileageController.text.trim().isNotEmpty) {
+        // keep manual mileage, just swap endpoints
+      }
+      _routeReversedFlag = !_routeReversedFlag;
+    });
+    _saveDraft();
+    _scheduleMatchUpdate();
+  }
+
   double _milesFromInputWithUnit(DistanceUnit unit) {
     return DistanceFormatter(unit)
             .parseInputMiles(_mileageController.text.trim()) ??
         0;
   }
 
+  List<UserSummary> _friendsFromFriendships(
+    DataService data,
+    String? selfId,
+  ) {
+    final friends = <UserSummary>[];
+    for (final f in data.friendships) {
+      final other = _friendFromFriendship(f, selfId);
+      if (other != null &&
+          other.userId.isNotEmpty &&
+          !friends.any((u) => u.userId == other.userId)) {
+        friends.add(other);
+      }
+    }
+    return friends;
+  }
+
+  UserSummary? _friendFromFriendship(Friendship friendship, String? selfId) {
+    final self = selfId ?? '';
+    if (friendship.requesterId == self) return friendship.addressee;
+    if (friendship.addresseeId == self) return friendship.requester;
+    if (friendship.addressee != null) return friendship.addressee;
+    if (friendship.requester != null) return friendship.requester;
+    return null;
+  }
+
+  Widget _buildShareSection(BuildContext context) {
+    final selected = _shareUsers;
+    final label = selected.isEmpty
+        ? 'Share with friends'
+        : 'Shared with ${selected.length} friend${selected.length == 1 ? '' : 's'}';
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        OutlinedButton.icon(
+          onPressed: _submitting ? null : _openShareSheet,
+          icon: const Icon(Icons.share),
+          label: Text(label),
+        ),
+        if (selected.isNotEmpty) ...[
+          const SizedBox(height: 8),
+          Wrap(
+            spacing: 8,
+            runSpacing: 8,
+            children: selected
+                .map(
+                  (u) => InputChip(
+                    label: Text(u.displayName),
+                    avatar: const Icon(Icons.person, size: 16),
+                    onDeleted: _submitting
+                        ? null
+                        : () {
+                            setState(() {
+                              _shareUserIds.remove(u.userId);
+                              _shareUsers.removeWhere(
+                                (item) => item.userId == u.userId,
+                              );
+                            });
+                          },
+                  ),
+                )
+                .toList(),
+          ),
+        ],
+      ],
+    );
+  }
+
+  Widget _buildSharedBanner() {
+    final from = _sharedFromUser;
+    return Container(
+      width: double.infinity,
+      padding: const EdgeInsets.all(12),
+      decoration: BoxDecoration(
+        color: Colors.orange.withValues(alpha: 0.1),
+        borderRadius: BorderRadius.circular(8),
+        border: Border.all(color: Colors.orange.withValues(alpha: 0.4)),
+      ),
+      child: Row(
+        children: [
+          const Icon(Icons.share, color: Colors.orange),
+          const SizedBox(width: 8),
+          Expanded(
+            child: Text(
+              from != null && from.isNotEmpty
+                  ? 'This entry was shared by $from.'
+                  : 'This entry was shared with you.',
+              style: const TextStyle(fontWeight: FontWeight.w600),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Future<void> _openShareSheet() async {
+    if (_activeLegShare != null) return;
+    final data = context.read<DataService>();
+    final auth = context.read<AuthService>();
+    try {
+      await data.fetchFriendships();
+    } catch (_) {}
+    if (!mounted) return;
+    final baseFriends = _friendsFromFriendships(data, auth.userId);
+    final initialSelectedIds = {..._shareUserIds};
+    final initialSelectedUsers = {
+      for (final u in _shareUsers) u.userId: u,
+    };
+
+    final result = await showModalBottomSheet<List<UserSummary>>(
+      context: context,
+      isScrollControlled: true,
+      builder: (ctx) {
+        final searchController = TextEditingController();
+        List<UserSummary> searchResults = [];
+        bool searching = false;
+        String searchTerm = '';
+        String? searchError;
+        final selectedIds = {...initialSelectedIds};
+        final selectedUsers = {...initialSelectedUsers};
+
+        return StatefulBuilder(
+          builder: (modalContext, setModalState) {
+            Future<void> runSearch(String term) async {
+              final trimmed = term.trim();
+              if (trimmed.isEmpty) {
+                setModalState(() {
+                  searchTerm = '';
+                  searchResults = [];
+                  searchError = null;
+                });
+                return;
+              }
+              setModalState(() {
+                searchTerm = trimmed;
+                searching = true;
+                searchError = null;
+              });
+              try {
+                final results =
+                    await data.searchUsers(trimmed, friendsOnly: true);
+                setModalState(() {
+                  searchResults = results;
+                });
+              } catch (e) {
+                setModalState(() {
+                  searchError = 'Search failed';
+                });
+              } finally {
+                setModalState(() {
+                  searching = false;
+                });
+              }
+            }
+
+            final list = searchTerm.isNotEmpty ? searchResults : baseFriends;
+            return Padding(
+              padding: EdgeInsets.only(
+                bottom: MediaQuery.of(modalContext).viewInsets.bottom + 16,
+                left: 16,
+                right: 16,
+                top: 16,
+              ),
+              child: Column(
+                mainAxisSize: MainAxisSize.min,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Row(
+                    children: [
+                      const Expanded(
+                        child: Text(
+                          'Share with friends',
+                          style: TextStyle(
+                            fontSize: 18,
+                            fontWeight: FontWeight.w600,
+                          ),
+                        ),
+                      ),
+                      IconButton(
+                        onPressed: () => Navigator.of(modalContext).pop(),
+                        icon: const Icon(Icons.close),
+                      ),
+                    ],
+                  ),
+                  const SizedBox(height: 8),
+                  TextField(
+                    controller: searchController,
+                    decoration: InputDecoration(
+                      labelText: 'Search friends',
+                      border: const OutlineInputBorder(),
+                      suffixIcon: IconButton(
+                        icon: const Icon(Icons.search),
+                        onPressed: () => runSearch(searchController.text),
+                      ),
+                    ),
+                    onSubmitted: runSearch,
+                  ),
+                  if (searching)
+                    const Padding(
+                      padding: EdgeInsets.only(top: 8.0),
+                      child: LinearProgressIndicator(minHeight: 2),
+                    ),
+                  if (searchError != null)
+                    Padding(
+                      padding: const EdgeInsets.only(top: 8.0),
+                      child: Text(
+                        searchError!,
+                        style: const TextStyle(color: Colors.red),
+                      ),
+                    ),
+                  const SizedBox(height: 12),
+                  SizedBox(
+                    height: 320,
+                    child: list.isEmpty
+                        ? const Center(child: Text('No friends found'))
+                        : ListView.builder(
+                            itemCount: list.length,
+                            itemBuilder: (_, index) {
+                              final user = list[index];
+                              final isSelected =
+                                  selectedIds.contains(user.userId);
+                              return CheckboxListTile(
+                                value: isSelected,
+                                title: Text(user.displayName),
+                                subtitle: user.username.isNotEmpty
+                                    ? Text('@${user.username}')
+                                    : null,
+                                onChanged: (checked) {
+                                  setModalState(() {
+                                    if (checked == true) {
+                                      selectedIds.add(user.userId);
+                                      selectedUsers[user.userId] = user;
+                                    } else {
+                                      selectedIds.remove(user.userId);
+                                      selectedUsers.remove(user.userId);
+                                    }
+                                  });
+                                },
+                              );
+                            },
+                          ),
+                  ),
+                  const SizedBox(height: 12),
+                  Row(
+                    children: [
+                      TextButton(
+                        onPressed: () => Navigator.of(modalContext).pop(),
+                        child: const Text('Cancel'),
+                      ),
+                      const Spacer(),
+                      ElevatedButton(
+                        onPressed: () => Navigator.of(modalContext).pop(
+                          selectedIds
+                              .map((id) => selectedUsers[id])
+                              .whereType<UserSummary>()
+                              .toList(),
+                        ),
+                        child: const Text('Save'),
+                      ),
+                    ],
+                  ),
+                ],
+              ),
+            );
+          },
+        );
+      },
+    );
+
+    if (result != null && mounted) {
+      setState(() {
+        _shareUsers = result;
+        _shareUserIds = result.map((u) => u.userId).toSet();
+      });
+    }
+  }
+
   void _syncManualFieldUnit(DistanceUnit currentUnit) {
     if (!_useManualMileage) {
       _lastDistanceUnit = currentUnit;
@@ -151,7 +489,7 @@ class _NewEntryPageState extends State<NewEntryPage> {
 
   Widget _buildTripSelector(BuildContext context) {
     final trips = context.watch<DataService>().tripList;
-    final sorted = [...trips]..sort((a, b) => b.tripId.compareTo(a.tripId));
+    final sorted = [...trips]..sort(TripSummary.compareByDateDesc);
     final tripIds = sorted.map((t) => t.tripId).toSet();
     final selectedValue =
         (_selectedTripId != null && tripIds.contains(_selectedTripId))
@@ -571,6 +909,96 @@ class _NewEntryPageState extends State<NewEntryPage> {
     }
   }
 
+  void _applyLegShare(LegShareData share) {
+    final entry = share.entry;
+    final beginTime = entry.beginTime;
+    final endTime = entry.endTime;
+    final routeStations = entry.route;
+    final mileageVal = entry.mileage;
+    final units = _distanceUnits(context);
+    final useManual = routeStations.isEmpty;
+    final routeResult = useManual
+        ? null
+        : RouteResult(
+            inputRoute: routeStations,
+            calculatedRoute: routeStations,
+            costs: const <double>[],
+            distance: mileageVal,
+          );
+    final tractionItems = _buildTractionFromApi(
+      entry.locos
+          .map((l) => {
+                "loco_id": l.id,
+                "type": l.type,
+                "number": l.number,
+                "class": l.locoClass,
+                "name": l.name,
+                "operator": l.operator,
+                "notes": l.notes,
+                "evn": l.evn,
+                "alloc_pos": l.allocPos,
+                "alloc_powering": l.powering ? 1 : 0,
+              })
+          .toList(),
+    );
+    final beginDelay = entry.beginDelayMinutes ?? 0;
+    final endDelay = entry.endDelayMinutes ?? 0;
+    final originTime = entry.originTime;
+    final destinationTime = entry.destinationTime;
+    final hasOriginTime = originTime != null;
+    final hasDestinationTime = destinationTime != null;
+    final hasEndTime = endTime != null || endDelay != 0;
+
+    _restoringDraft = true;
+    setState(() {
+      _activeLegShare = share;
+      _sharedFromUser = share.sharedFromName;
+      _shareNotificationId = share.notificationId;
+      _selectedTripId = null;
+      _selectedDate = beginTime;
+      _selectedTime = TimeOfDay.fromDateTime(beginTime);
+      _selectedEndDate = endTime ?? beginTime;
+      _selectedEndTime = TimeOfDay.fromDateTime(endTime ?? beginTime);
+      _hasEndTime = hasEndTime;
+      _selectedOriginDate = originTime ?? beginTime;
+      _selectedOriginTime = TimeOfDay.fromDateTime(originTime ?? beginTime);
+      _selectedDestinationDate = destinationTime ?? endTime ?? beginTime;
+      _selectedDestinationTime =
+          TimeOfDay.fromDateTime(destinationTime ?? endTime ?? beginTime);
+      _hasOriginTime = hasOriginTime;
+      _hasDestinationTime = hasDestinationTime;
+      _useManualMileage = useManual;
+      _routeResult = routeResult;
+      _startController.text = entry.start;
+      _endController.text = entry.end;
+      _headcodeController.text = entry.headcode.toUpperCase();
+      _notesController.text = entry.notes;
+      _networkController.text = entry.network.toUpperCase();
+      _originController.text = entry.origin;
+      _destinationController.text = entry.destination;
+      _beginDelayController.text = beginDelay.toString();
+      _endDelayController.text = endDelay.toString();
+      _mileageController.text = mileageVal == 0
+          ? ''
+          : _formatDistance(
+              units,
+              mileageVal,
+              decimals: 2,
+              includeUnit: false,
+            );
+      _tractionItems
+        ..clear()
+        ..addAll(tractionItems);
+      if (_tractionItems.where((e) => e.isMarker).isEmpty) {
+        _tractionItems.insert(0, _TractionItem.marker());
+      }
+      _lastSubmittedSnapshot = null;
+      _shareUserIds.clear();
+      _shareUsers.clear();
+    });
+    _restoringDraft = false;
+  }
+
   List<String> _parseRouteStations(dynamic raw) {
     if (raw is List) {
       return raw.map((e) => e.toString()).toList();
@@ -809,7 +1237,8 @@ class _NewEntryPageState extends State<NewEntryPage> {
                       minimumSize: const Size(0, 36),
                       tapTargetSize: MaterialTapTargetSize.shrinkWrap,
                     ),
-                    onPressed: _isEditing ? null : _openDrafts,
+                    onPressed:
+                        _isEditing || _activeLegShare != null ? null : _openDrafts,
                     icon: const Icon(Icons.list_alt, size: 16),
                     label: const Text('Drafts'),
                   ),
@@ -820,7 +1249,10 @@ class _NewEntryPageState extends State<NewEntryPage> {
                     minimumSize: const Size(0, 36),
                     tapTargetSize: MaterialTapTargetSize.shrinkWrap,
                   ),
-                    onPressed: _isEditing || _savingDraft || _submitting
+                  onPressed: _isEditing ||
+                          _savingDraft ||
+                          _submitting ||
+                          _activeLegShare != null
                       ? null
                       : _saveDraftManually,
                   icon: _savingDraft
@@ -847,7 +1279,13 @@ class _NewEntryPageState extends State<NewEntryPage> {
               ),
             ],
           ),
+          if (_activeLegShare != null) ...[
+            const SizedBox(height: 8),
+            _buildSharedBanner(),
+          ],
           _buildTripSelector(context),
+          const SizedBox(height: 12),
+          if (_activeLegShare == null) _buildShareSection(context),
           _dateTimeGroup(
                 context,
                 title: 'Departure time',
@@ -996,17 +1434,53 @@ class _NewEntryPageState extends State<NewEntryPage> {
               _buildTractionList(),
             ], minHeight: balancedHeight);
 
+            final routeStart = _routeResult?.calculatedRoute.isNotEmpty == true
+                ? _routeResult!.calculatedRoute.first
+                : (_routeResult?.inputRoute.isNotEmpty == true
+                    ? _routeResult!.inputRoute.first
+                    : _startController.text.trim());
+            final routeEnd = _routeResult?.calculatedRoute.isNotEmpty == true
+                ? _routeResult!.calculatedRoute.last
+                : (_routeResult?.inputRoute.isNotEmpty == true
+                    ? _routeResult!.inputRoute.last
+                    : _endController.text.trim());
+
             final mileagePanel = _section(
-              'Mileage',
+              'Your Journey',
               [
                 if (!_useManualMileage)
-                  Align(
+                  Wrap(
-                    alignment: Alignment.centerLeft,
+                    spacing: 12,
-                    child: ElevatedButton.icon(
+                    runSpacing: 8,
+                    children: [
+                      ElevatedButton.icon(
                         onPressed: _openCalculator,
                         icon: const Icon(Icons.calculate, size: 18),
                         label: const Text('Open mileage calculator'),
                       ),
+                      OutlinedButton.icon(
+                        onPressed: _reverseRouteAndEndpoints,
+                        icon: const Icon(Icons.swap_horiz),
+                        label: const Text('Reverse route'),
+                      ),
+                    ],
+                  )
+                else
+                  Align(
+                    alignment: Alignment.centerLeft,
+                    child: OutlinedButton.icon(
+                      onPressed: _reverseRouteAndEndpoints,
+                      icon: const Icon(Icons.swap_horiz),
+                      label: const Text('Reverse route'),
+                    ),
+                  ),
+                if (routeStart.isNotEmpty || routeEnd.isNotEmpty)
+                  ListTile(
+                    contentPadding: EdgeInsets.zero,
+                    title: const Text('Route'),
+                    subtitle: Text(
+                      '${routeStart.isEmpty ? 'Start' : routeStart} → ${routeEnd.isEmpty ? 'End' : routeEnd}',
+                    ),
                   ),
                 if (_useManualMileage)
                   TextFormField(
@@ -1072,22 +1546,25 @@ class _NewEntryPageState extends State<NewEntryPage> {
                 children: [
                   entryPanel,
                   const SizedBox(height: 16),
+                  if (twoCol) ...[
                     trainPanel,
                     const SizedBox(height: 16),
-                  twoCol
+                    Row(
-                      ? Row(
                       crossAxisAlignment: CrossAxisAlignment.start,
                       children: [
                         Expanded(child: tractionPanel),
                         const SizedBox(width: 16),
                         Expanded(child: mileagePanel),
                       ],
-                        )
+                    ),
-                      : Column(
+                  ] else
+                    Column(
                       children: [
-                            tractionPanel,
-                            const SizedBox(height: 16),
                         mileagePanel,
+                        const SizedBox(height: 16),
+                        trainPanel,
+                        const SizedBox(height: 16),
+                        tractionPanel,
                       ],
                     ),
                   const SizedBox(height: 12),
@@ -1100,11 +1577,15 @@ class _NewEntryPageState extends State<NewEntryPage> {
                             child: CircularProgressIndicator(strokeWidth: 2),
                           )
                         : const Icon(Icons.send),
-                    label: Text(
+                    label: () {
-                      _submitting
+                      final shareMode = _activeLegShare != null;
-                          ? (_isEditing ? 'Saving...' : 'Submitting...')
+                      if (_submitting) {
-                          : (_isEditing ? 'Save changes' : 'Submit entry'),
+                        if (shareMode) return const Text('Accepting...');
-                    ),
+                        return Text(_isEditing ? 'Saving...' : 'Submitting...');
+                      }
+                      if (shareMode) return const Text('Accept entry');
+                      return Text(_isEditing ? 'Save changes' : 'Submit entry');
+                    }(),
                   ),
                 ],
               ),

lib/components/pages/new_entry/new_entry_submit_logic.dart

@@ -71,12 +71,14 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
     final beginDelay = _parseDelayMinutes(_beginDelayController.text);
     final endDelay =
         _hasEndTime ? _parseDelayMinutes(_endDelayController.text) : 0;
-    final snapshot = _buildSubmissionSnapshot(
+    final snapshot = _currentSubmissionSnapshot(
       routeStations: routeStations,
       startVal: startVal,
       endVal: endVal,
       mileageVal: mileageVal,
       tractionPayload: tractionPayload,
+      beginDelay: beginDelay,
+      endDelay: endDelay,
     );
     if (_lastSubmittedSnapshot != null &&
         _snapshotEquality.equals(_lastSubmittedSnapshot, snapshot)) {
@@ -108,6 +110,8 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
         "leg_begin_delay": beginDelay,
         if (_hasEndTime) "leg_end_delay": endDelay,
         "locos": tractionPayload,
+        if (_activeLegShare != null) "leg_share_id": _activeLegShare!.id,
+        "share_user_ids": _shareUserIds.toList(),
       };
       if (_useManualMileage) {
         final body = {
@@ -136,6 +140,9 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
       if (!mounted) return;
       dataService.refreshLegs();
       await dataService.fetchNotifications();
+      if (_shareNotificationId != null) {
+        await dataService.dismissNotifications([_shareNotificationId!]);
+      }
       if (!mounted) return;
       messenger?.showSnackBar(
         SnackBar(
@@ -156,16 +163,35 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
     }
   }
 
-  Map<String, dynamic> _buildSubmissionSnapshot({
+  Map<String, dynamic> _currentSubmissionSnapshot({
-    required List<String> routeStations,
+    List<String>? routeStations,
-    required String startVal,
+    String? startVal,
-    required String endVal,
+    String? endVal,
-    required double mileageVal,
+    double? mileageVal,
-    required List<Map<String, dynamic>> tractionPayload,
+    List<Map<String, dynamic>>? tractionPayload,
+    int? beginDelay,
+    int? endDelay,
   }) {
-    final beginDelay = _parseDelayMinutes(_beginDelayController.text);
+    final stations = routeStations ?? (_routeResult?.calculatedRoute ?? []);
-    final endDelay =
+    final start = startVal ??
-        _hasEndTime ? _parseDelayMinutes(_endDelayController.text) : 0;
+        (_useManualMileage
+            ? _startController.text.trim()
+            : (stations.isNotEmpty ? stations.first : ''));
+    final end = endVal ??
+        (_useManualMileage
+            ? _endController.text.trim()
+            : (stations.isNotEmpty ? stations.last : ''));
+    final mileage = mileageVal ??
+        (_useManualMileage
+            ? (_distanceUnits(context)
+                    .milesFromInput(_mileageController.text.trim()) ??
+                0)
+            : (_routeResult?.distance ?? 0));
+    final traction = tractionPayload ?? _buildTractionPayload();
+    final begin = beginDelay ?? _parseDelayMinutes(_beginDelayController.text);
+    final endDelayVal =
+        endDelay ?? (_hasEndTime ? _parseDelayMinutes(_endDelayController.text) : 0);
+
     return {
       "legId": widget.editLegId,
       "useManualMileage": _useManualMileage,
@@ -177,18 +203,20 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
       "hasOriginTime": _hasOriginTime,
       "legDestinationTime": _destinationDateTime?.toIso8601String(),
       "hasDestinationTime": _hasDestinationTime,
-      "start": startVal,
+      "start": start,
-      "end": endVal,
+      "end": end,
       "origin": _originController.text.trim(),
       "destination": _destinationController.text.trim(),
-      "routeStations": routeStations,
+      "routeStations": stations,
-      "mileage": mileageVal,
+      "mileage": mileage,
       "network": _networkController.text.trim(),
       "notes": _notesController.text.trim(),
       "headcode": _headcodeController.text.trim(),
-      "beginDelay": beginDelay,
+      "beginDelay": begin,
-      "endDelay": endDelay,
+      "endDelay": endDelayVal,
-      "locos": tractionPayload,
+      "legShareId": _activeLegShare?.id,
+      "shareUserIds": _shareUserIds.toList(),
+      "locos": traction,
       "routeResult": _routeResult == null
           ? null
           : {
@@ -223,6 +251,7 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
   }
 
   Future<void> _resetFormState({bool clearDraft = false}) async {
+    final hadShare = _activeLegShare != null || widget.legShare != null;
     _formKey.currentState?.reset();
     _startController.clear();
     _endController.clear();
@@ -252,6 +281,11 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
       _matchDestinationToEntry = false;
       _matchUpdateScheduled = false;
       _routeResult = null;
+      _activeLegShare = null;
+      _sharedFromUser = null;
+      _shareNotificationId = null;
+      _shareUserIds.clear();
+      _shareUsers.clear();
       _tractionItems
         ..clear()
         ..add(_TractionItem.marker());
@@ -261,6 +295,10 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
       _savingDraft = false;
       _loadedDraftSnapshot = null;
     });
+    if (hadShare && mounted) {
+      // Clear any share params from the URL when resetting.
+      GoRouter.of(context).go('/add');
+    }
     if (clearDraft) {
       await _clearDraft();
     }

lib/components/pages/trips.dart

@@ -232,7 +232,7 @@ class _TripsPageState extends State<TripsPage> {
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
                       Text(
-                        'Trip',
+                        'Trip #${trip.id}',
                         style: Theme.of(context).textTheme.labelMedium,
                       ),
                       const SizedBox(height: 4),

lib/components/traction/traction_card.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:mileograph_flutter/objects/objects.dart';
+import 'package:mileograph_flutter/services/api_service.dart';
 import 'package:mileograph_flutter/services/distance_unit_service.dart';
 import 'package:provider/provider.dart';
 
@@ -210,6 +211,11 @@ Future<void> showTractionDetails(
 ) async {
   final hasMileageOrTrips = _hasMileageOrTrips(loco);
   final distanceUnits = context.read<DistanceUnitService>();
+  final api = context.read<ApiService>();
+  final leaderboardId = _leaderboardId(loco);
+  final leaderboardFuture = leaderboardId == null
+      ? Future.value(const <LeaderboardEntry>[])
+      : _fetchLocoLeaderboard(api, leaderboardId);
   await showModalBottomSheet(
     context: context,
     isScrollControlled: true,
@@ -295,6 +301,63 @@ Future<void> showTractionDetails(
                       _detailRow(context, 'EVN', loco.evn ?? ''),
                       if (loco.notes != null && loco.notes!.isNotEmpty)
                         _detailRow(context, 'Notes', loco.notes!),
+                      const SizedBox(height: 16),
+                      Text(
+                        'Leaderboard',
+                        style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                              fontWeight: FontWeight.w700,
+                            ),
+                      ),
+                      const SizedBox(height: 8),
+                      FutureBuilder<List<LeaderboardEntry>>(
+                        future: leaderboardFuture,
+                        builder: (context, snapshot) {
+                          if (snapshot.connectionState == ConnectionState.waiting) {
+                            return const Padding(
+                              padding: EdgeInsets.symmetric(vertical: 12.0),
+                              child: Center(
+                                child: SizedBox(
+                                  height: 24,
+                                  width: 24,
+                                  child: CircularProgressIndicator(strokeWidth: 2),
+                                ),
+                              ),
+                            );
+                          }
+                          if (snapshot.hasError) {
+                            return Padding(
+                              padding: const EdgeInsets.symmetric(vertical: 8.0),
+                              child: Text(
+                                'Failed to load leaderboard',
+                                style: Theme.of(context).textTheme.labelMedium?.copyWith(
+                                      color: Theme.of(context).colorScheme.error,
+                                    ),
+                              ),
+                            );
+                          }
+                          final entries = snapshot.data ?? const <LeaderboardEntry>[];
+                          if (entries.isEmpty) {
+                            return Padding(
+                              padding: const EdgeInsets.symmetric(vertical: 8.0),
+                              child: Text(
+                                'No mileage leaderboard yet.',
+                                style: Theme.of(context).textTheme.bodyMedium,
+                              ),
+                            );
+                          }
+                          return Column(
+                            children: entries.asMap().entries.map((entry) {
+                              final rank = entry.key + 1;
+                              return _leaderboardRow(
+                                context,
+                                rank,
+                                entry.value,
+                                distanceUnits,
+                              );
+                            }).toList(),
+                          );
+                        },
+                      ),
                     ],
                   ),
                 ),
@@ -307,6 +370,105 @@ Future<void> showTractionDetails(
   );
 }
 
+Future<List<LeaderboardEntry>> _fetchLocoLeaderboard(
+  ApiService api,
+  int locoId,
+) async {
+  try {
+    final json = await api.get('/loco/leaderboard/id/$locoId');
+    Iterable<dynamic>? raw;
+    if (json is List) {
+      raw = json;
+    } else if (json is Map) {
+      for (final key in ['data', 'leaderboard', 'results']) {
+        final value = json[key];
+        if (value is List) {
+          raw = value;
+          break;
+        }
+      }
+    }
+    if (raw == null) return const [];
+    return raw.whereType<Map>().map((e) {
+      return LeaderboardEntry.fromJson(
+        e.map((key, value) => MapEntry(key.toString(), value)),
+      );
+    }).toList();
+  } catch (e) {
+    debugPrint('Failed to fetch loco leaderboard for $locoId: $e');
+    rethrow;
+  }
+}
+
+int? _leaderboardId(LocoSummary loco) {
+  int? parse(dynamic value) {
+    if (value == null) return null;
+    if (value is int) return value == 0 ? null : value;
+    if (value is num) return value.toInt() == 0 ? null : value.toInt();
+    return int.tryParse(value.toString());
+  }
+
+  return parse(loco.extra['loco_id']) ??
+      parse(loco.extra['id']) ??
+      parse(loco.id);
+}
+
+Widget _leaderboardRow(
+  BuildContext context,
+  int rank,
+  LeaderboardEntry entry,
+  DistanceUnitService distanceUnits,
+) {
+  final theme = Theme.of(context);
+  final primaryName =
+      entry.userFullName.isNotEmpty ? entry.userFullName : entry.username;
+  final mileageLabel = distanceUnits.format(entry.mileage, decimals: 1);
+
+  return Padding(
+    padding: const EdgeInsets.symmetric(vertical: 6.0),
+    child: Row(
+      children: [
+        Container(
+          width: 36,
+          height: 36,
+          alignment: Alignment.center,
+          decoration: BoxDecoration(
+            color: theme.colorScheme.primaryContainer,
+            borderRadius: BorderRadius.circular(10),
+          ),
+          child: Text(
+            '#$rank',
+            style: theme.textTheme.labelMedium?.copyWith(
+              fontWeight: FontWeight.w700,
+              color: theme.colorScheme.onPrimaryContainer,
+            ),
+          ),
+        ),
+        const SizedBox(width: 10),
+        Expanded(
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Text(
+                primaryName,
+                style: theme.textTheme.bodyMedium?.copyWith(
+                  fontWeight: FontWeight.w700,
+                ),
+              ),
+            ],
+          ),
+        ),
+        Text(
+          mileageLabel,
+          style: theme.textTheme.bodyMedium?.copyWith(
+            fontWeight: FontWeight.w700,
+          ),
+        ),
+      ],
+    ),
+  );
+}
+
 Widget _detailRow(BuildContext context, String label, String value) {
   if (value.isEmpty) return const SizedBox.shrink();
   return Padding(

lib/components/widgets/friend_request_notification_card.dart

@@ -0,0 +1,127 @@
+import 'package:flutter/material.dart';
+import 'package:mileograph_flutter/objects/objects.dart';
+import 'package:mileograph_flutter/services/data_service.dart';
+import 'package:provider/provider.dart';
+
+class FriendRequestNotificationCard extends StatelessWidget {
+  const FriendRequestNotificationCard({super.key, required this.notification});
+
+  final UserNotification notification;
+
+  @override
+  Widget build(BuildContext context) {
+    final data = context.read<DataService>();
+    final friendshipId = notification.body.trim();
+    if (friendshipId.isEmpty) {
+      return const Text('Invalid friend request notification.');
+    }
+    final future = data.fetchFriendshipById(friendshipId);
+    return FutureBuilder<Friendship?>(
+      future: future,
+      builder: (context, snapshot) {
+        if (snapshot.connectionState == ConnectionState.waiting) {
+          return const Padding(
+            padding: EdgeInsets.symmetric(vertical: 6.0),
+            child: SizedBox(
+              height: 20,
+              width: 20,
+              child: CircularProgressIndicator(strokeWidth: 2),
+            ),
+          );
+        }
+        if (snapshot.hasError) {
+          return const Text('Failed to load request details.');
+        }
+        final friendship = snapshot.data;
+        final requester = friendship?.requester;
+        if (friendship == null || requester == null) {
+          return const Text('Friend request details unavailable.');
+        }
+        final buttonStyle = ElevatedButton.styleFrom(
+          minimumSize: const Size(0, 36),
+        );
+        return Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              children: [
+                const Icon(Icons.person_add_alt, size: 18),
+                const SizedBox(width: 6),
+                Text(
+                  requester.displayName.isNotEmpty
+                      ? requester.displayName
+                      : '@${requester.username}',
+                  style: Theme.of(context).textTheme.titleSmall,
+                ),
+              ],
+            ),
+            const SizedBox(height: 6),
+            Wrap(
+              spacing: 8,
+              children: [
+                ElevatedButton(
+                  style: buttonStyle,
+                  onPressed: () =>
+                      _respond(context, friendship.id, accept: true),
+                  child: const Text('Accept'),
+                ),
+                ElevatedButton(
+                  style: buttonStyle,
+                  onPressed: () =>
+                      _respond(context, friendship.id, accept: false),
+                  child: const Text('Reject'),
+                ),
+              ],
+            ),
+          ],
+        );
+      },
+    );
+  }
+
+  Future<void> _respond(
+    BuildContext context,
+    String? friendshipId, {
+    required bool accept,
+  }) async {
+    if (friendshipId == null || friendshipId.isEmpty) return;
+    final data = context.read<DataService>();
+    final messenger = ScaffoldMessenger.maybeOf(context);
+    try {
+      if (accept) {
+        await data.acceptFriendship(friendshipId);
+        if (!context.mounted) return;
+        messenger?.showSnackBar(
+          const SnackBar(content: Text('Friend request accepted')),
+        );
+        await _dismissNotification(context, messenger);
+      } else {
+        await data.rejectFriendship(friendshipId);
+        if (!context.mounted) return;
+        messenger?.showSnackBar(
+          const SnackBar(content: Text('Friend request rejected')),
+        );
+        await _dismissNotification(context, messenger);
+      }
+      await data.fetchPendingFriendships();
+    } catch (e) {
+      if (!context.mounted) return;
+      messenger?.showSnackBar(
+        SnackBar(content: Text('Failed to respond: $e')),
+      );
+    }
+  }
+
+  Future<void> _dismissNotification(
+    BuildContext context,
+    ScaffoldMessengerState? messenger,
+  ) async {
+    try {
+      await context.read<DataService>().dismissNotifications([notification.id]);
+    } catch (e) {
+      messenger?.showSnackBar(
+        SnackBar(content: Text('Failed to dismiss notification: $e')),
+      );
+    }
+  }
+}

lib/components/widgets/leg_share_notification_card.dart

@@ -0,0 +1,147 @@
+import 'dart:async';
+
+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 LegShareNotificationCard extends StatelessWidget {
+  const LegShareNotificationCard({super.key, required this.notification});
+
+  final UserNotification notification;
+
+  @override
+  Widget build(BuildContext context) {
+    final data = context.read<DataService>();
+    final legShareId = notification.body.trim();
+    if (legShareId.isEmpty) {
+      return const Text('Invalid leg share notification.');
+    }
+    final future = data.fetchLegShare(legShareId);
+    return FutureBuilder<LegShareData?>(
+      future: future,
+      builder: (context, snapshot) {
+        if (snapshot.connectionState == ConnectionState.waiting) {
+          return const Padding(
+            padding: EdgeInsets.symmetric(vertical: 6.0),
+            child: SizedBox(
+              height: 20,
+              width: 20,
+              child: CircularProgressIndicator(strokeWidth: 2),
+            ),
+          );
+        }
+        if (snapshot.hasError) {
+          return const Text('Failed to load shared entry.');
+        }
+        final share = snapshot.data;
+        final entry = share?.entry;
+        if (share == null || entry == null) {
+          return const Text('Shared entry unavailable.');
+        }
+        final begin = entry.beginTime;
+        final beginStr =
+            '${begin.year.toString().padLeft(4, '0')}-${begin.month.toString().padLeft(2, '0')}-${begin.day.toString().padLeft(2, '0')} ${begin.hour.toString().padLeft(2, '0')}:${begin.minute.toString().padLeft(2, '0')}';
+        final start = entry.route.isNotEmpty ? entry.route.first : entry.start;
+        final end = entry.route.isNotEmpty ? entry.route.last : entry.end;
+        final sharedAt = share.sharedAt;
+        final sharedAtStr = sharedAt == null
+            ? null
+            : '${sharedAt.year.toString().padLeft(4, '0')}-${sharedAt.month.toString().padLeft(2, '0')}-${sharedAt.day.toString().padLeft(2, '0')} ${sharedAt.hour.toString().padLeft(2, '0')}:${sharedAt.minute.toString().padLeft(2, '0')}';
+        final from = share.sharedFromName;
+
+        return Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text('$beginStr • $start → $end'),
+            if (from.isNotEmpty)
+              Padding(
+                padding: const EdgeInsets.only(top: 4.0),
+                child: Text(
+                  'From $from',
+                  style: Theme.of(context).textTheme.bodySmall,
+                ),
+              ),
+            if (sharedAtStr != null)
+              Padding(
+                padding: const EdgeInsets.only(top: 4.0),
+                child: Text(
+                  'Shared at $sharedAtStr',
+                  style: Theme.of(context).textTheme.bodySmall,
+                ),
+              ),
+            const SizedBox(height: 8),
+            Wrap(
+              spacing: 8,
+              runSpacing: 8,
+              children: [
+                ElevatedButton(
+                  onPressed: () => _accept(context, share),
+                  child: const Text('Accept'),
+                ),
+                OutlinedButton(
+                  onPressed: () => _inspect(context, share),
+                  child: const Text('Inspect'),
+                ),
+                TextButton(
+                  onPressed: () => _reject(context, share),
+                  child: const Text('Reject'),
+                ),
+              ],
+            ),
+          ],
+        );
+      },
+    );
+  }
+
+  Future<void> _accept(BuildContext context, LegShareData share) async {
+    final data = context.read<DataService>();
+    final messenger = ScaffoldMessenger.maybeOf(context);
+    try {
+      await data.acceptLegShare(share);
+      if (!context.mounted) return;
+      await data.dismissNotifications([notification.id]);
+      // Refresh legs in the background.
+      unawaited(data.refreshLegs());
+      messenger?.showSnackBar(
+        const SnackBar(content: Text('Shared entry added to logbook')),
+      );
+    } catch (e) {
+      messenger?.showSnackBar(
+        SnackBar(content: Text('Failed to add shared entry: $e')),
+      );
+    }
+  }
+
+  Future<void> _reject(BuildContext context, LegShareData share) async {
+    final data = context.read<DataService>();
+    final messenger = ScaffoldMessenger.maybeOf(context);
+    try {
+      await data.rejectLegShare(share.id);
+      if (!context.mounted) return;
+      await data.dismissNotifications([notification.id]);
+      messenger?.showSnackBar(
+        const SnackBar(content: Text('Share rejected')),
+      );
+    } catch (e) {
+      messenger?.showSnackBar(
+        SnackBar(content: Text('Failed to reject share: $e')),
+      );
+    }
+  }
+
+  Future<void> _inspect(BuildContext context, LegShareData share) async {
+    final router = GoRouter.of(context);
+    // Close notifications panel if open.
+    if (Navigator.canPop(context)) {
+      Navigator.of(context).pop();
+    }
+    await Future<void>.delayed(Duration.zero);
+    final target = share.copyWith(notificationId: notification.id);
+    final ts = DateTime.now().millisecondsSinceEpoch;
+    final path = '/add?share=${Uri.encodeComponent(share.id)}&ts=$ts';
+    router.go(path, extra: target);
+  }
+}

lib/objects/objects.dart

@@ -66,6 +66,29 @@ DateTime _asDateTime(dynamic value, [DateTime? fallback]) {
   return parsed ?? (fallback ?? DateTime.fromMillisecondsSinceEpoch(0));
 }
 
+DateTime? _asNullableDateTime(dynamic value) {
+  if (value == null) return null;
+  if (value is DateTime) return value;
+  return DateTime.tryParse(value.toString());
+}
+
+int compareTripsByDateDesc(
+  DateTime? aDate,
+  DateTime? bDate,
+  int aId,
+  int bId,
+) {
+  if (aDate != null && bDate != null) {
+    final cmp = bDate.compareTo(aDate);
+    if (cmp != 0) return cmp;
+  } else if (aDate != null) {
+    return -1;
+  } else if (bDate != null) {
+    return 1;
+  }
+  return bId.compareTo(aId);
+}
+
 class DestinationObject {
   const DestinationObject(
     this.label,
@@ -81,24 +104,245 @@ class DestinationObject {
 }
 
 class UserData {
-  const UserData(this.username, this.fullName, this.userId, this.email);
+  const UserData({
+    required this.username,
+    required this.fullName,
+    required this.userId,
+    required this.email,
+    bool? elevated,
+    bool? disabled,
+  })  : elevated = elevated ?? false,
+        disabled = disabled ?? false;
 
   final String userId;
   final String username;
   final String fullName;
   final String email;
+  final bool elevated;
+  final bool disabled;
 }
 
 class AuthenticatedUserData extends UserData {
   const AuthenticatedUserData({
-    required String userId,
+    required super.userId,
-    required String username,
+    required super.username,
-    required String fullName,
+    required super.fullName,
-    required String email,
+    required super.email,
+    bool? elevated,
+    bool? isElevated,
+    bool? disabled,
+    bool? isDisabled,
     required this.accessToken,
-  }) : super(username, fullName, userId, email);
+  }) : super(
+          elevated: (elevated ?? false) || (isElevated ?? false),
+          disabled: (disabled ?? false) || (isDisabled ?? false),
+        );
 
   final String accessToken;
+  bool get isElevated => elevated;
+}
+
+class UserSummary extends UserData {
+  const UserSummary({
+    required super.username,
+    required super.fullName,
+    required super.userId,
+    required super.email,
+    super.elevated = false,
+    super.disabled = false,
+  });
+
+  String get displayName => fullName.isNotEmpty ? fullName : username;
+
+  factory UserSummary.fromJson(Map<String, dynamic> json) => UserSummary(
+        username: _asString(json['username'] ?? json['user_name']),
+        fullName: _asString(json['full_name'] ?? json['name']),
+        userId: _asString(json['user_id'] ?? json['id']),
+        email: _asString(json['email']),
+        elevated: _asBool(json['elevated'] ?? json['is_elevated'], false),
+        disabled: _asBool(json['disabled'], false),
+      );
+}
+
+class Friendship {
+  final String? id;
+  final String status;
+  final String requesterId;
+  final String addresseeId;
+  final UserSummary? requester;
+  final UserSummary? addressee;
+  final DateTime? requestedAt;
+  final DateTime? respondedAt;
+
+  const Friendship({
+    required this.id,
+    required this.status,
+    required this.requesterId,
+    required this.addresseeId,
+    this.requester,
+    this.addressee,
+    this.requestedAt,
+    this.respondedAt,
+  });
+
+  String get _statusLower => status.toLowerCase();
+  bool get isNone => _statusLower == 'none';
+  bool get isPending => _statusLower == 'pending';
+  bool get isAccepted => _statusLower == 'accepted';
+  bool get isBlocked => _statusLower == 'blocked';
+  bool get isDeclined =>
+      _statusLower == 'declined' || _statusLower == 'rejected';
+
+  factory Friendship.fromJson(Map<String, dynamic> json) {
+    DateTime? parseDate(dynamic value) {
+      if (value is DateTime) return value;
+      return DateTime.tryParse(value?.toString() ?? '');
+    }
+
+    String pickId(Map<String, dynamic> map, List<String> keys) {
+      for (final key in keys) {
+        final value = map[key];
+        if (value == null) continue;
+        final str = value.toString();
+        if (str.isNotEmpty) return str;
+      }
+      return '';
+    }
+
+    UserSummary? parseUser(dynamic raw, {String? usernameKey, String? fullKey, String? idKey}) {
+      if (raw is Map) {
+        return UserSummary.fromJson(
+          raw.map((key, value) => MapEntry(key.toString(), value)),
+        );
+      }
+      final username = usernameKey != null ? _asString(json[usernameKey]) : '';
+      final fullName = fullKey != null ? _asString(json[fullKey]) : '';
+      final id = idKey != null ? _asString(json[idKey]) : '';
+      if (username.isEmpty && fullName.isEmpty && id.isEmpty) return null;
+      return UserSummary(
+        username: username,
+        fullName: fullName,
+        userId: id,
+        email: '',
+      );
+    }
+
+    final requesterJson = json['requester'] ??
+        json['requestor'] ??
+        json['sender'] ??
+        json['from_user'];
+    final addresseeJson = json['addressee'] ??
+        json['receiver'] ??
+        json['target_user'] ??
+        json['to_user'];
+
+    final requester = parseUser(
+      requesterJson,
+      usernameKey: 'requester_username',
+      fullKey: 'requester_full_name',
+      idKey: 'requester_id',
+    );
+    final addressee = parseUser(
+      addresseeJson,
+      usernameKey: 'addressee_username',
+      fullKey: 'addressee_full_name',
+      idKey: 'addressee_id',
+    );
+
+    final requesterUsername = _asString(json['requester_username']);
+    final requesterFullName = _asString(json['requester_full_name']);
+    final addresseeUsername = _asString(json['addressee_username']);
+    final addresseeFullName = _asString(json['addressee_full_name']);
+
+    final requesterId = requester?.userId.isNotEmpty == true
+        ? requester!.userId
+        : pickId(json, [
+            'requester_id',
+            'requestor_id',
+            'requestorId',
+            'sender_id',
+            'from_user_id',
+            'from_id',
+            'user_id',
+          ]);
+    final addresseeId = addressee?.userId.isNotEmpty == true
+        ? addressee!.userId
+        : pickId(json, [
+            'addressee_id',
+            'addresseeId',
+            'receiver_id',
+            'target_user_id',
+            'to_user_id',
+            'to_id',
+          ]);
+
+    final normalizedStatus = _asString(json['status'], 'none').trim();
+
+    return Friendship(
+      id: pickId(json, ['friendship_id', 'friendshipId', 'id']),
+      status: normalizedStatus.isNotEmpty ? normalizedStatus : 'none',
+      requesterId: requesterId,
+      addresseeId: addresseeId,
+      requester: requester ??
+          (requesterUsername.isNotEmpty || requesterFullName.isNotEmpty
+              ? UserSummary(
+                  username: requesterUsername,
+                  fullName: requesterFullName,
+                  userId: requesterId,
+                  email: '',
+                )
+              : null),
+      addressee: addressee ??
+          (addresseeUsername.isNotEmpty || addresseeFullName.isNotEmpty
+              ? UserSummary(
+                  username: addresseeUsername,
+                  fullName: addresseeFullName,
+                  userId: addresseeId,
+                  email: '',
+                )
+              : null),
+      requestedAt: parseDate(json['requested_at'] ?? json['requestedAt']),
+      respondedAt: parseDate(json['responded_at'] ?? json['respondedAt']),
+    );
+  }
+
+  factory Friendship.fromStatusJson(
+    Map<String, dynamic> json, {
+    String? targetUserId,
+  }) {
+    final statusVal = _asString(json['status'], 'none').trim();
+    if (statusVal.toLowerCase() == 'none') {
+      return Friendship(
+        id: null,
+        status: 'none',
+        requesterId: '',
+        addresseeId: targetUserId ?? '',
+      );
+    }
+    return Friendship.fromJson(json);
+  }
+
+  Friendship copyWith({
+    String? id,
+    String? status,
+    String? requesterId,
+    String? addresseeId,
+    UserSummary? requester,
+    UserSummary? addressee,
+    DateTime? requestedAt,
+    DateTime? respondedAt,
+  }) {
+    return Friendship(
+      id: id ?? this.id,
+      status: status ?? this.status,
+      requesterId: requesterId ?? this.requesterId,
+      addresseeId: addresseeId ?? this.addresseeId,
+      requester: requester ?? this.requester,
+      addressee: addressee ?? this.addressee,
+      requestedAt: requestedAt ?? this.requestedAt,
+      respondedAt: respondedAt ?? this.respondedAt,
+    );
+  }
 }
 
 class HomepageStats {
@@ -147,10 +391,13 @@ class HomepageStats {
       user: userData == null
           ? null
           : UserData(
-              userData['username'] ?? '',
+              username: userData['username'] ?? '',
-              userData['full_name'] ?? '',
+              fullName: userData['full_name'] ?? '',
-              userData['user_id'] ?? '',
+              userId: userData['user_id'] ?? '',
-              userData['email'] ?? '',
+              email: userData['email'] ?? '',
+              elevated:
+                  _asBool(userData['elevated'] ?? userData['is_elevated'], false),
+              disabled: _asBool(userData['disabled'], false),
             ),
     );
   }
@@ -375,6 +622,7 @@ class Loco {
   final String type, number, locoClass;
   final String? name, operator, notes, evn;
   final bool powering;
+  final int allocPos;
 
   Loco({
     required this.id,
@@ -386,6 +634,7 @@ class Loco {
     this.notes,
     this.evn,
     this.powering = true,
+    this.allocPos = 0,
   });
 
   factory Loco.fromJson(Map<String, dynamic> json) => Loco(
@@ -398,6 +647,7 @@ class Loco {
     notes: json['notes'],
     evn: json['evn'],
     powering: _asBool(json['alloc_powering'] ?? json['powering'], true),
+    allocPos: _asInt(json['alloc_pos'], 0),
   );
 }
 
@@ -431,6 +681,7 @@ class LocoSummary extends Loco {
     this.location,
     Map<String, dynamic>? extra,
     super.powering = true,
+    super.allocPos = 0,
   }) : extra = extra ?? const {},
        super(
          id: locoId,
@@ -443,7 +694,7 @@ class LocoSummary extends Loco {
        );
 
   factory LocoSummary.fromJson(Map<String, dynamic> json) => LocoSummary(
-    locoId: json['loco_id'] ?? json['id'] ?? 0,
+    locoId: _asInt(json['loco_id'] ?? json['id']),
     locoType: json['type'] ?? json['loco_type'] ?? '',
     locoNumber: json['number'] ?? json['loco_number'] ?? '',
     locoName: json['name'] ?? json['loco_name'] ?? "",
@@ -466,6 +717,7 @@ class LocoSummary extends Loco {
     location: json['location'],
     extra: Map<String, dynamic>.from(json),
     powering: _asBool(json['alloc_powering'] ?? json['powering'], true),
+    allocPos: _asInt(json['alloc_pos'], 0),
   );
 }
 
@@ -722,9 +974,12 @@ class TripSummary {
   final double tripMileage;
   final int legCount;
   final List<TripLocoStat> locoStats;
+  final DateTime? startDate;
+  final DateTime? endDate;
 
   int get locoHadCount => locoStats.length;
   int get winnersCount => locoStats.where((e) => e.won).length;
+  DateTime? get primaryDate => endDate ?? startDate;
 
   TripSummary({
     required this.tripId,
@@ -732,9 +987,58 @@ class TripSummary {
     required this.tripMileage,
     this.legCount = 0,
     List<TripLocoStat>? locoStats,
+    this.startDate,
+    this.endDate,
   }) : locoStats = locoStats ?? const [];
 
-  factory TripSummary.fromJson(Map<String, dynamic> json) => TripSummary(
+  static int compareByDateDesc(TripSummary a, TripSummary b) =>
+      compareTripsByDateDesc(a.primaryDate, b.primaryDate, a.tripId, b.tripId);
+
+  factory TripSummary.fromJson(Map<String, dynamic> json) {
+    DateTime? startDate;
+    DateTime? endDate;
+
+    DateTime? parseDate(dynamic value) => _asNullableDateTime(value);
+
+    for (final key in [
+      'trip_begin_time',
+      'trip_start',
+      'trip_start_time',
+      'trip_date',
+      'start_date',
+      'date',
+    ]) {
+      startDate ??= parseDate(json[key]);
+    }
+
+    for (final key in [
+      'trip_end_time',
+      'trip_finish_time',
+      'trip_end',
+      'end_date',
+    ]) {
+      endDate ??= parseDate(json[key]);
+    }
+
+    if (json['trip_legs'] is List) {
+      for (final leg in json['trip_legs'] as List) {
+        DateTime? begin;
+        if (leg is TripLeg) {
+          begin = leg.beginTime;
+        } else if (leg is Map) {
+          begin = parseDate(leg['leg_begin_time']);
+        }
+        if (begin == null) continue;
+        if (startDate == null || begin.isBefore(startDate)) {
+          startDate = begin;
+        }
+        if (endDate == null || begin.isAfter(endDate)) {
+          endDate = begin;
+        }
+      }
+    }
+
+    return TripSummary(
       tripId: _asInt(json['trip_id']),
       tripName: _asString(json['trip_name']),
       tripMileage: _asDouble(json['trip_mileage']),
@@ -745,7 +1049,10 @@ class TripSummary {
       locoStats: TripLocoStat.listFromJson(
         json['stats'] ?? json['trip_locos'] ?? json['locos'],
       ),
+      startDate: startDate,
+      endDate: endDate,
     );
+  }
 }
 
 class Leg {
@@ -753,6 +1060,7 @@ class Leg {
   final String start, end, network, notes, headcode, user;
   final String origin, destination;
   final List<String> route;
+  final String? legShareId;
   final DateTime beginTime;
   final DateTime? endTime;
   final DateTime? originTime;
@@ -783,6 +1091,7 @@ class Leg {
     this.endDelayMinutes,
     this.origin = '',
     this.destination = '',
+    this.legShareId,
   });
 
   factory Leg.fromJson(Map<String, dynamic> json) {
@@ -823,6 +1132,93 @@ class Leg {
           : _asInt(json['leg_end_delay']),
       origin: _asString(json['leg_origin']),
       destination: _asString(json['leg_destination']),
+      legShareId: _asString(json['leg_share_id']),
+    );
+  }
+}
+
+class LegShareData {
+  final String id;
+  final Leg entry;
+  final Map<String, dynamic> metadata;
+  final UserSummary? requester;
+  final UserSummary? addressee;
+  final DateTime? sharedAt;
+  final String status;
+  final int? notificationId;
+
+  LegShareData({
+    required this.id,
+    required this.entry,
+    required this.metadata,
+    this.requester,
+    this.addressee,
+    this.sharedAt,
+    this.status = 'pending',
+    this.notificationId,
+  });
+
+  LegShareData copyWith({int? notificationId}) {
+    return LegShareData(
+      id: id,
+      entry: entry,
+      metadata: metadata,
+      requester: requester,
+      addressee: addressee,
+      sharedAt: sharedAt,
+      status: status,
+      notificationId: notificationId ?? this.notificationId,
+    );
+  }
+
+  String get sharedFromName =>
+      requester?.displayName.isNotEmpty == true ? requester!.displayName : '';
+
+  factory LegShareData.fromJson(Map<String, dynamic> json) {
+    final metadataRaw = json['metadata'];
+    final entryRaw = json['entry'];
+    final metadata = metadataRaw is Map
+        ? metadataRaw.map((k, v) => MapEntry(k.toString(), v))
+        : <String, dynamic>{};
+    final shareId = _asString(
+      metadata['leg_share_id'] ?? metadata['share_id'] ?? json['leg_share_id'],
+    );
+    final requester = UserSummary.fromJson({
+      "user_id": metadata['requester_id'] ?? metadata['from_user_id'] ?? '',
+      "username": metadata['requester_username'] ?? '',
+      "full_name": metadata['requester_full_name'] ?? '',
+      "email": '',
+    });
+    final addressee = UserSummary.fromJson({
+      "user_id": metadata['addressee_id'] ?? metadata['target_user_id'] ?? '',
+      "username": metadata['addressee_username'] ?? '',
+      "full_name": metadata['addressee_full_name'] ?? '',
+      "email": '',
+    });
+    DateTime? sharedAt;
+    for (final key in ['requested_at', 'created_at', 'shared_at']) {
+      final value = metadata[key];
+      if (value != null) {
+        sharedAt = DateTime.tryParse(value.toString());
+        if (sharedAt != null) break;
+      }
+    }
+    final entryMap = entryRaw is Map
+        ? entryRaw.map((k, v) => MapEntry(k.toString(), v))
+        : json.map((k, v) => MapEntry(k.toString(), v));
+    final entryObj = Leg.fromJson(entryMap);
+    final resolvedId = shareId.isNotEmpty
+        ? shareId
+        : entryObj.legShareId ?? _asString(json['leg_share_id']);
+
+    return LegShareData(
+      id: resolvedId,
+      entry: entryObj,
+      metadata: metadata,
+      requester: requester.userId.isEmpty ? null : requester,
+      addressee: addressee.userId.isEmpty ? null : addressee,
+      sharedAt: sharedAt,
+      status: _asString(metadata['status'], 'pending'),
     );
   }
 }
@@ -941,6 +1337,34 @@ class TripDetail {
 
   int get locoHadCount => locoStats.length;
   int get winnersCount => locoStats.where((e) => e.won).length;
+  DateTime? get startDate {
+    DateTime? earliest;
+    for (final leg in legs) {
+      final begin = leg.beginTime;
+      if (begin == null) continue;
+      if (earliest == null || begin.isBefore(earliest)) {
+        earliest = begin;
+      }
+    }
+    return earliest;
+  }
+
+  DateTime? get endDate {
+    DateTime? latest;
+    for (final leg in legs) {
+      final begin = leg.beginTime;
+      if (begin == null) continue;
+      if (latest == null || begin.isAfter(latest)) {
+        latest = begin;
+      }
+    }
+    return latest;
+  }
+
+  DateTime? get primaryDate => endDate ?? startDate;
+
+  static int compareByDateDesc(TripDetail a, TripDetail b) =>
+      compareTripsByDateDesc(a.primaryDate, b.primaryDate, a.id, b.id);
 
   TripDetail({
     required this.id,
@@ -1073,6 +1497,8 @@ class UserNotification {
   final int id;
   final String title;
   final String body;
+  final String channel;
+  final String type;
   final DateTime? createdAt;
   final bool dismissed;
 
@@ -1080,6 +1506,8 @@ class UserNotification {
     required this.id,
     required this.title,
     required this.body,
+    required this.channel,
+    required this.type,
     required this.createdAt,
     required this.dismissed,
   });
@@ -1096,6 +1524,8 @@ class UserNotification {
       id: _asInt(json['notification_id'] ?? json['id']),
       title: _asString(json['title']),
       body: _asString(json['body']),
+      channel: _asString(json['channel']),
+      type: _asString(json['type'] ?? json['notification_type']),
       createdAt: createdAt,
       dismissed: _asBool(json['dismissed'] ?? false, false),
     );

lib/services/authservice.dart

@@ -21,6 +21,9 @@ class AuthService extends ChangeNotifier {
   String? get userId => _user?.userId;
   String? get username => _user?.username;
   String? get fullName => _user?.fullName;
+  bool get isElevated => _user?.isElevated ?? false;
+  bool get isAdmin => isElevated; // alias for old name
+  bool get isDisabled => _user?.disabled ?? false;
 
   void setLoginData({
     required String userId,
@@ -28,6 +31,8 @@ class AuthService extends ChangeNotifier {
     required String fullName,
     required String accessToken,
     required String email,
+    bool isElevated = false,
+    bool isDisabled = false,
   }) {
     _user = AuthenticatedUserData(
       userId: userId,
@@ -35,6 +40,8 @@ class AuthService extends ChangeNotifier {
       fullName: fullName,
       accessToken: accessToken,
       email: email,
+      isElevated: isElevated,
+      disabled: isDisabled,
     );
     _persistToken(accessToken);
     notifyListeners();
@@ -70,6 +77,8 @@ class AuthService extends ChangeNotifier {
       fullName: userResponse['full_name'],
       accessToken: accessToken,
       email: userResponse['email'],
+      isElevated: _parseIsElevated(userResponse),
+      isDisabled: _parseIsDisabled(userResponse),
     );
   }
 
@@ -95,6 +104,8 @@ class AuthService extends ChangeNotifier {
         fullName: userResponse['full_name'],
         accessToken: token,
         email: userResponse['email'],
+        isElevated: _parseIsElevated(userResponse),
+        isDisabled: _parseIsDisabled(userResponse),
       );
     } catch (_) {
       await _clearToken();
@@ -157,4 +168,60 @@ class AuthService extends ChangeNotifier {
   void logout() {
     handleTokenExpired(); // reuse
   }
+
+  bool _parseIsElevated(Map<String, dynamic> json) {
+    dynamic value = json['is_elevated'] ??
+        json['elevated'] ??
+        json['is_admin'] ??
+        json['admin'] ??
+        json['isAdmin'] ??
+        json['admin_user'] ??
+        json['role'] ??
+        json['roles'] ??
+        json['permissions'] ??
+        json['scopes'] ??
+        json['is_staff'] ??
+        json['staff'] ??
+        json['is_superuser'] ??
+        json['superuser'] ??
+        json['groups'];
+
+    bool parseBoolish(dynamic v) {
+      if (v is bool) return v;
+      if (v is num) return v != 0;
+      final str = v?.toString().toLowerCase().trim();
+      if (str == null || str.isEmpty) return false;
+      if (['1', 'true', 'yes', 'y', 'admin', 'superuser', 'staff', 'elevated'].contains(str)) {
+        return true;
+      }
+      return str.contains('admin') || str.contains('superuser') || str.contains('staff');
+    }
+
+    if (value is List) {
+      for (final entry in value) {
+        if (parseBoolish(entry)) return true;
+        final s = entry?.toString().toLowerCase();
+        if (s != null &&
+            (s.contains('admin') ||
+                s.contains('superuser') ||
+                s.contains('staff') ||
+                s.contains('elevated') ||
+                s == 'root')) {
+          return true;
+        }
+      }
+      return false;
+    }
+
+    return parseBoolish(value);
+  }
+
+  bool _parseIsDisabled(Map<String, dynamic> json) {
+    dynamic value = json['disabled'] ?? json['is_disabled'];
+    if (value is bool) return value;
+    if (value is num) return value != 0;
+    final str = value?.toString().toLowerCase().trim();
+    if (str == null || str.isEmpty) return false;
+    return ['1', 'true', 'yes', 'y', 'disabled'].contains(str);
+  }
 }

lib/services/data_service/data_service.dart

@@ -12,3 +12,5 @@ part 'data_service_trips.dart';
 part 'data_service_notifications.dart';
 part 'data_service_badges.dart';
 part 'data_service_stats.dart';
+part 'data_service_friendships.dart';
+part 'data_service_leg_share.dart';

lib/services/data_service/data_service_core.dart

@@ -64,6 +64,18 @@ class DataService extends ChangeNotifier {
   bool isLocoTimelineLoading(int locoId) =>
       _isLocoTimelineLoading[locoId] ?? false;
 
+  // Friendships
+  List<Friendship> _friendships = [];
+  List<Friendship> _pendingIncoming = [];
+  List<Friendship> _pendingOutgoing = [];
+  List<Friendship> get friendships => _friendships;
+  List<Friendship> get pendingIncoming => _pendingIncoming;
+  List<Friendship> get pendingOutgoing => _pendingOutgoing;
+  bool _isFriendshipsLoading = false;
+  bool get isFriendshipsLoading => _isFriendshipsLoading;
+  bool _isPendingFriendshipsLoading = false;
+  bool get isPendingFriendshipsLoading => _isPendingFriendshipsLoading;
+
   // Trips
   List<TripSummary> _trips = [];
   List<TripSummary> get trips => _trips;
@@ -96,6 +108,10 @@ class DataService extends ChangeNotifier {
   bool get isHomepageLoading => _isHomepageLoading;
   bool _isOnThisDayLoading = false;
   bool get isOnThisDayLoading => _isOnThisDayLoading;
+  List<LeaderboardEntry> _friendsLeaderboard = [];
+  List<LeaderboardEntry> get friendsLeaderboard => _friendsLeaderboard;
+  bool _isFriendsLeaderboardLoading = false;
+  bool get isFriendsLeaderboardLoading => _isFriendsLeaderboardLoading;
 
   // Notifications
   List<UserNotification> _notifications = [];
@@ -151,7 +167,8 @@ class DataService extends ChangeNotifier {
     try {
       final json = await api.get('/stats/homepage');
       _homepageStats = HomepageStats.fromJson(json);
-      _trips = _homepageStats?.trips ?? [];
+      _trips = [...(_homepageStats?.trips ?? const [])]
+        ..sort(TripSummary.compareByDateDesc);
     } catch (e) {
       debugPrint('Failed to fetch homepage stats: $e');
       _homepageStats = null;

lib/services/data_service/data_service_friendships.dart

@@ -0,0 +1,282 @@
+part of 'data_service.dart';
+
+extension DataServiceFriendships on DataService {
+  Future<void> fetchFriendships() async {
+    _isFriendshipsLoading = true;
+    try {
+      final json = await api.get('/friendships');
+      List<dynamic>? list;
+      if (json is List) {
+        list = json;
+      } else if (json is Map) {
+        for (final key in ['friendships', 'data', 'items', 'results']) {
+          final value = json[key];
+          if (value is List) {
+            list = value;
+            break;
+          }
+        }
+      }
+      final parsed = list
+          ?.whereType<Map>()
+          .map((e) => Friendship.fromJson(
+                e.map((k, v) => MapEntry(k.toString(), v)),
+              ))
+          .where((f) => f.isAccepted)
+          .toList();
+      _friendships = parsed ?? [];
+    } catch (e) {
+      debugPrint('Failed to fetch friendships: $e');
+      _friendships = [];
+    } finally {
+      _isFriendshipsLoading = false;
+      _notifyAsync();
+    }
+  }
+
+  Future<void> fetchPendingFriendships() async {
+    _isPendingFriendshipsLoading = true;
+    try {
+      final incoming = await _fetchPending('incoming');
+      final outgoing = await _fetchPending('outgoing');
+      _pendingIncoming = incoming;
+      _pendingOutgoing = outgoing;
+    } catch (e) {
+      debugPrint('Failed to fetch pending friendships: $e');
+      _pendingIncoming = [];
+      _pendingOutgoing = [];
+    } finally {
+      _isPendingFriendshipsLoading = false;
+      _notifyAsync();
+    }
+  }
+
+  Future<List<Friendship>> _fetchPending(String direction) async {
+    final json = await api.get('/friendships/pending?direction=$direction');
+    List<dynamic>? list;
+    if (json is List) {
+      list = json;
+    } else if (json is Map) {
+      for (final key in ['friendships', 'data', 'items', 'results']) {
+        final value = json[key];
+        if (value is List) {
+          list = value;
+          break;
+        }
+      }
+    }
+    return list
+            ?.whereType<Map>()
+            .map((e) => Friendship.fromJson(
+                  e.map((k, v) => MapEntry(k.toString(), v)),
+                ))
+            .where((f) => f.isPending)
+            .toList() ??
+        const [];
+  }
+
+  Future<Friendship?> fetchFriendshipById(String friendshipId) async {
+    try {
+      final json = await api.get('/friendships/$friendshipId');
+      if (json is Map) {
+        return Friendship.fromJson(
+          json.map((k, v) => MapEntry(k.toString(), v)),
+        );
+      }
+    } catch (e) {
+      debugPrint('Failed to fetch friendship $friendshipId: $e');
+    }
+    return null;
+  }
+
+  Future<List<UserSummary>> searchUsers(
+    String query, {
+    bool friendsOnly = false,
+  }) async {
+    final encoded = Uri.encodeComponent(query);
+    final json = await api.get(
+      '/users/search?search=$encoded${friendsOnly ? '&friends_only=true' : ''}',
+    );
+    List<dynamic>? list;
+    if (json is List) {
+      list = json;
+    } else if (json is Map) {
+      for (final key in ['users', 'data', 'results', 'items']) {
+        final value = json[key];
+        if (value is List) {
+          list = value;
+          break;
+        }
+      }
+    }
+    if (list == null) return const [];
+    return list
+        .whereType<Map>()
+        .map((e) => UserSummary.fromJson(
+              e.map((k, v) => MapEntry(k.toString(), v)),
+            ))
+        .toList();
+  }
+
+  Future<Friendship> fetchFriendshipStatus(String targetUserId) async {
+    try {
+      final json = await api.get('/friendships/status/$targetUserId');
+      if (json is Map) {
+        return Friendship.fromStatusJson(
+          json.map((k, v) => MapEntry(k.toString(), v)),
+          targetUserId: targetUserId,
+        );
+      }
+    } catch (e) {
+      debugPrint('Failed to fetch friendship status for $targetUserId: $e');
+    }
+    return Friendship(
+      id: null,
+      status: 'none',
+      requesterId: '',
+      addresseeId: targetUserId,
+    );
+  }
+
+  Future<Friendship> requestFriendship(
+    String targetUserId, {
+    UserSummary? targetUser,
+  }) async {
+    final json = await api.post('/friendships/request', {
+      "target_user_id": targetUserId,
+    });
+    final friendship = _parseAndUpsertFriendship(
+      json,
+      fallbackStatus: 'pending',
+      overrideAddressee: targetUser,
+    );
+    _pendingOutgoing = [friendship, ..._pendingOutgoing];
+    _notifyAsync();
+    return friendship;
+  }
+
+  Future<Friendship> acceptFriendship(String friendshipId) async {
+    final json = await api.post('/friendships/$friendshipId/accept', {});
+    final friendship = _parseAndUpsertFriendship(json, fallbackStatus: 'accepted');
+    _pendingIncoming = _pendingIncoming.where((f) => f.id != friendshipId).toList();
+    _notifyAsync();
+    return friendship;
+  }
+
+  Future<Friendship> rejectFriendship(String friendshipId) async {
+    final json = await api.post('/friendships/$friendshipId/reject', {});
+    final friendship = _parseAndUpsertFriendship(json, fallbackStatus: 'declined');
+    _pendingIncoming = _pendingIncoming.where((f) => f.id != friendshipId).toList();
+    _notifyAsync();
+    return friendship;
+  }
+
+  Future<Friendship> cancelFriendship(String friendshipId) async {
+    final json = await api.post('/friendships/$friendshipId/cancel', {});
+    final friendship =
+        _parseAndRemoveFriendship(json, friendshipId, status: 'none');
+    _pendingOutgoing =
+        _pendingOutgoing.where((f) => f.id != friendshipId).toList();
+    _notifyAsync();
+    return friendship;
+  }
+
+  Future<void> deleteFriendship(String friendshipId) async {
+    try {
+      await api.delete('/friendships/$friendshipId');
+    } catch (e) {
+      debugPrint('Failed to delete friendship $friendshipId: $e');
+      rethrow;
+    }
+    _friendships = _friendships.where((f) => f.id != friendshipId).toList();
+    _pendingIncoming =
+        _pendingIncoming.where((f) => f.id != friendshipId).toList();
+    _pendingOutgoing =
+        _pendingOutgoing.where((f) => f.id != friendshipId).toList();
+    _notifyAsync();
+  }
+
+  Future<Friendship> blockUser(String targetUserId) async {
+    final json = await api.post('/friendships/block', {
+      "target_user_id": targetUserId,
+    });
+    final friendship = _parseAndUpsertFriendship(json, fallbackStatus: 'blocked');
+    _pendingIncoming = _pendingIncoming
+        .where((f) => f.addresseeId != targetUserId && f.requesterId != targetUserId)
+        .toList();
+    _pendingOutgoing = _pendingOutgoing
+        .where((f) => f.addresseeId != targetUserId && f.requesterId != targetUserId)
+        .toList();
+    _notifyAsync();
+    return friendship;
+  }
+
+  Friendship _parseAndUpsertFriendship(
+    dynamic json, {
+    String fallbackStatus = 'none',
+    UserSummary? overrideAddressee,
+  }) {
+    Friendship friendship;
+    if (json is Map) {
+      friendship = Friendship.fromJson(
+        json.map((k, v) => MapEntry(k.toString(), v)),
+      );
+    } else {
+      friendship = Friendship(
+        id: null,
+        status: fallbackStatus,
+        requesterId: '',
+        addresseeId: '',
+      );
+    }
+    if (overrideAddressee != null &&
+        (friendship.addressee == null ||
+            friendship.addressee!.userId.isEmpty ||
+            friendship.addressee!.displayName.isEmpty)) {
+      friendship = friendship.copyWith(
+        addressee: overrideAddressee,
+        addresseeId: overrideAddressee.userId,
+      );
+    }
+    _upsertFriendship(friendship);
+    return friendship;
+  }
+
+  Friendship _parseAndRemoveFriendship(
+    dynamic json,
+    String friendshipId, {
+    required String status,
+  }) {
+    Friendship friendship;
+    if (json is Map) {
+      friendship = Friendship.fromJson(
+        json.map((k, v) => MapEntry(k.toString(), v)),
+      );
+    } else {
+      friendship = Friendship(
+        id: friendshipId,
+        status: status,
+        requesterId: '',
+        addresseeId: '',
+      );
+    }
+    _friendships = _friendships.where((f) => f.id != friendshipId).toList();
+    _notifyAsync();
+    return friendship;
+  }
+
+  void _upsertFriendship(Friendship friendship) {
+    if (friendship.id == null || friendship.id!.isEmpty) {
+      _notifyAsync();
+      return;
+    }
+    final idx = _friendships.indexWhere((f) => f.id == friendship.id);
+    if (idx >= 0) {
+      _friendships[idx] = friendship;
+    } else {
+      _friendships = [friendship, ..._friendships];
+    }
+    _friendships = _friendships.where((f) => f.isAccepted).toList();
+    _notifyAsync();
+  }
+}

lib/services/data_service/data_service_leg_share.dart

@@ -0,0 +1,97 @@
+part of 'data_service.dart';
+
+extension DataServiceLegShare on DataService {
+  Future<LegShareData?> fetchLegShare(String legShareId) async {
+    try {
+      final json = await api.get('/legs/share/$legShareId');
+      if (json is Map) {
+        return LegShareData.fromJson(
+          json.map((k, v) => MapEntry(k.toString(), v)),
+        );
+      }
+    } catch (e) {
+      debugPrint('Failed to fetch leg share $legShareId: $e');
+      rethrow;
+    }
+    return null;
+  }
+
+  Future<void> rejectLegShare(String legShareId) async {
+    try {
+      await api.post('/legs/share/$legShareId/reject', {});
+    } catch (e) {
+      debugPrint('Failed to reject leg share $legShareId: $e');
+      rethrow;
+    }
+  }
+
+  Future<int?> acceptLegShare(LegShareData share) async {
+    final entry = share.entry;
+    final hasRoute = entry.route.isNotEmpty;
+    final locosPayload = <Map<String, dynamic>>[];
+    for (var i = 0; i < entry.locos.length; i++) {
+      final loco = entry.locos[i];
+      final pos = loco.allocPos != 0 ? loco.allocPos : i;
+      locosPayload.add({
+        "loco_id": loco.id,
+        "alloc_pos": pos,
+        "alloc_powering": loco.powering ? 1 : 0,
+      });
+    }
+    final payload = <String, dynamic>{
+      "leg_share_id": share.id,
+      "leg_trip": null,
+      "leg_begin_time": entry.beginTime.toIso8601String(),
+      if (entry.endTime != null) "leg_end_time": entry.endTime!.toIso8601String(),
+      if (entry.originTime != null)
+        "leg_origin_time": entry.originTime!.toIso8601String(),
+      if (entry.destinationTime != null)
+        "leg_destination_time": entry.destinationTime!.toIso8601String(),
+      "leg_notes": entry.notes,
+      "leg_headcode": entry.headcode,
+      "leg_network": entry.network,
+      "leg_origin": entry.origin,
+      "leg_destination": entry.destination,
+      "leg_begin_delay": entry.beginDelayMinutes ?? 0,
+      if (entry.endDelayMinutes != null) "leg_end_delay": entry.endDelayMinutes,
+      "locos": locosPayload,
+      "share_user_ids": <String>[],
+    };
+
+    dynamic response;
+    if (hasRoute) {
+      response = await api.post(
+        '/add',
+        {
+          ...payload,
+          "leg_route": entry.route,
+          "leg_mileage": entry.mileage,
+        },
+      );
+    } else {
+      response = await api.post(
+        '/add/manual',
+        {
+          ...payload,
+          "leg_start": entry.start,
+          "leg_end": entry.end,
+          "leg_distance": entry.mileage,
+          "isKilometers": false,
+        },
+      );
+    }
+
+    final legId = _parseNullableInt(
+      response is Map ? response['leg_id'] : null,
+    );
+    if (legId != null) return legId;
+    return null;
+  }
+
+  int? _parseNullableInt(dynamic value) {
+    if (value is int) return value;
+    if (value is num) return value.toInt();
+    if (value is String) return int.tryParse(value);
+    return null;
+  }
+}

lib/services/data_service/data_service_notifications.dart

@@ -20,7 +20,7 @@ extension DataServiceNotifications on DataService {
       final parsed = list
           ?.whereType<Map<String, dynamic>>()
           .map(UserNotification.fromJson)
-          .where((n) => !n.dismissed)
+          .where((n) => !n.dismissed && n.channel.toLowerCase() != 'web')
           .toList();
 
       if (parsed != null) {

lib/services/data_service/data_service_stats.dart

@@ -25,4 +25,38 @@ extension DataServiceStats on DataService {
       _notifyAsync();
     }
   }
+
+  Future<void> fetchFriendsLeaderboard() async {
+    if (_isFriendsLeaderboardLoading) return;
+    _isFriendsLeaderboardLoading = true;
+    _notifyAsync();
+    try {
+      final json = await api.get('/stats/leaderboard/friends');
+      List<dynamic>? list;
+      if (json is List) {
+        list = json;
+      } else if (json is Map) {
+        for (final key in ['leaderboard', 'data', 'items', 'results']) {
+          final value = json[key];
+          if (value is List) {
+            list = value;
+            break;
+          }
+        }
+      }
+      _friendsLeaderboard = list
+              ?.whereType<Map>()
+              .map((e) => LeaderboardEntry.fromJson(
+                    e.map((k, v) => MapEntry(k.toString(), v)),
+                  ))
+              .toList() ??
+          const [];
+    } catch (e) {
+      debugPrint('Failed to fetch friends leaderboard: $e');
+      _friendsLeaderboard = [];
+    } finally {
+      _isFriendsLeaderboardLoading = false;
+      _notifyAsync();
+    }
+  }
 }

lib/services/data_service/data_service_trips.dart

@@ -6,7 +6,7 @@ extension DataServiceTrips on DataService {
     try {
       final json = await api.get('/trips/info');
       final tripDetails = _parseTripInfoList(json);
-      _tripDetails = [...tripDetails]..sort((a, b) => b.id.compareTo(a.id));
+      _tripDetails = [...tripDetails]..sort(TripDetail.compareByDateDesc);
       _tripList = tripDetails
           .map(
             (detail) => TripSummary(
@@ -15,10 +15,12 @@ extension DataServiceTrips on DataService {
               tripMileage: detail.mileage,
               legCount: detail.legCount,
               locoStats: detail.locoStats,
+              startDate: detail.startDate,
+              endDate: detail.endDate,
             ),
           )
           .toList()
-        ..sort((a, b) => b.tripId.compareTo(a.tripId));
+        ..sort(TripSummary.compareByDateDesc);
     } catch (e) {
       debugPrint('Failed to fetch trip_map: $e');
       _tripDetails = [];
@@ -49,7 +51,7 @@ extension DataServiceTrips on DataService {
             .map((e) => TripSummary.fromJson(e))
             .toList();
 
-        _tripList = [...tripMap]..sort((a, b) => b.tripId.compareTo(a.tripId));
+        _tripList = [...tripMap]..sort(TripSummary.compareByDateDesc);
       } else {
         debugPrint('Unexpected trip list response: $json');
         _tripList = [];
@@ -83,7 +85,7 @@ extension DataServiceTrips on DataService {
             .map((e) => TripSummary.fromJson(e))
             .toList();
 
-        _tripList = [...tripMap]..sort((a, b) => b.tripId.compareTo(a.tripId));
+        _tripList = [...tripMap]..sort(TripSummary.compareByDateDesc);
       } else {
         debugPrint('Unexpected trip list response: $json');
         _tripList = [];
@@ -105,7 +107,7 @@ extension DataServiceTrips on DataService {
     } else {
       _tripList = [trip, ..._tripList];
     }
-    _tripList.sort((a, b) => b.tripId.compareTo(a.tripId));
+    _tripList.sort(TripSummary.compareByDateDesc);
     _notifyAsync();
   }
 

lib/ui/app_shell.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:dynamic_color/dynamic_color.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
@@ -11,12 +13,16 @@ 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/badges.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/stats.dart';
 import 'package:mileograph_flutter/components/pages/traction.dart';
+import 'package:mileograph_flutter/components/widgets/friend_request_notification_card.dart';
+import 'package:mileograph_flutter/components/widgets/leg_share_notification_card.dart';
+import 'package:mileograph_flutter/objects/objects.dart';
 import 'package:mileograph_flutter/services/authservice.dart';
 import 'package:mileograph_flutter/services/data_service.dart';
 import 'package:mileograph_flutter/services/navigation_guard.dart';
@@ -204,7 +210,15 @@ class _MyAppState extends State<MyApp> {
               path: '/traction/new',
               builder: (context, state) => const NewTractionPage(),
             ),
-            GoRoute(path: '/add', builder: (context, state) => NewEntryPage()),
+            GoRoute(
+              path: '/add',
+              builder: (context, state) {
+                final extra = state.extra;
+                return NewEntryPage(
+                  legShare: extra is LegShareData ? extra : null,
+                );
+              },
+            ),
             GoRoute(
               path: '/more',
               builder: (context, state) => const MorePage(),
@@ -213,6 +227,10 @@ class _MyAppState extends State<MyApp> {
               path: '/more/profile',
               builder: (context, state) => const ProfilePage(),
             ),
+            GoRoute(
+              path: '/more/badges',
+              builder: (context, state) => const BadgesPage(),
+            ),
             GoRoute(
               path: '/more/stats',
               builder: (context, state) => const StatsPage(),
@@ -221,6 +239,10 @@ class _MyAppState extends State<MyApp> {
               path: '/more/settings',
               builder: (context, state) => const SettingsPage(),
             ),
+            GoRoute(
+              path: '/more/admin',
+              builder: (context, state) => const AdminPage(),
+            ),
             GoRoute(
               path: '/legs/edit/:id',
               builder: (_, state) {
@@ -307,6 +329,7 @@ class _MyHomePageState extends State<MyHomePage> {
 
   bool _fetched = false;
   bool _railCollapsed = false;
+  Timer? _notificationsTimer;
 
   @override
   void didChangeDependencies() {
@@ -343,10 +366,35 @@ class _MyHomePageState extends State<MyHomePage> {
         if (data.notifications.isEmpty) {
           data.fetchNotifications();
         }
+        if (data.friendships.isEmpty && !data.isFriendshipsLoading) {
+          data.fetchFriendships();
+        }
+        if ((data.pendingIncoming.isEmpty && data.pendingOutgoing.isEmpty) &&
+            !data.isPendingFriendshipsLoading) {
+          data.fetchPendingFriendships();
+        }
+        _startNotificationPolling();
       });
     });
   }
 
+  void _startNotificationPolling() {
+    _notificationsTimer?.cancel();
+    final auth = context.read<AuthService>();
+    if (!auth.isLoggedIn) return;
+    _notificationsTimer = Timer.periodic(const Duration(minutes: 2), (_) async {
+      if (!mounted) return;
+      final auth = context.read<AuthService>();
+      if (!auth.isLoggedIn) return;
+      final data = context.read<DataService>();
+      try {
+        await data.fetchNotifications();
+      } catch (_) {
+        // Errors already logged inside data service.
+      }
+    });
+  }
+
   @override
   Widget build(BuildContext context) {
     final uri = GoRouterState.of(context).uri;
@@ -410,6 +458,11 @@ class _MyHomePageState extends State<MyHomePage> {
             ),
             actions: [
               _buildNotificationAction(context, data),
+              IconButton(
+                tooltip: 'Profile',
+                onPressed: () => context.go('/more/profile'),
+                icon: const Icon(Icons.person),
+              ),
               IconButton(
                 tooltip: 'Settings',
                 onPressed: () => context.go('/more/settings'),
@@ -620,6 +673,13 @@ class _MyHomePageState extends State<MyHomePage> {
   Widget _buildNotificationsContent(BuildContext context, bool isWide) {
     final data = context.watch<DataService>();
     final notifications = data.notifications;
+    final dismissibleIds = notifications
+        .where(
+          (n) =>
+              !_isFriendRequestNotification(n) && !_isLegShareNotification(n),
+        )
+        .map((e) => e.id)
+        .toList();
     final loading = data.isNotificationsLoading;
     final listHeight = isWide
         ? 380.0
@@ -646,6 +706,9 @@ class _MyHomePageState extends State<MyHomePage> {
           separatorBuilder: (_, index) => const SizedBox(height: 8),
           itemBuilder: (ctx, index) {
             final item = notifications[index];
+            final isFriendRequest = _isFriendRequestNotification(item);
+            final isLegShare = _isLegShareNotification(item);
+            final isSpecial = isFriendRequest || isLegShare;
             return Card(
               child: Padding(
                 padding: const EdgeInsets.all(12.0),
@@ -668,7 +731,11 @@ class _MyHomePageState extends State<MyHomePage> {
                               ),
                               const SizedBox(height: 4),
                               Text(
-                                item.body,
+                                isFriendRequest || isLegShare
+                                    ? isFriendRequest
+                                        ? 'Accept to share entries'
+                                        : 'Shared entry details below.'
+                                    : item.body,
                                 style: Theme.of(context).textTheme.bodyMedium,
                               ),
                               if (item.createdAt != null) ...[
@@ -694,6 +761,7 @@ class _MyHomePageState extends State<MyHomePage> {
                           ],
                         ),
                       ),
+                      if (!isSpecial) ...[
                         const SizedBox(width: 8),
                         TextButton(
                           onPressed: () =>
@@ -701,6 +769,19 @@ class _MyHomePageState extends State<MyHomePage> {
                           child: const Text('Dismiss'),
                         ),
                       ],
+                    ],
+                  ),
+                    if (isFriendRequest)
+                      Padding(
+                        padding: const EdgeInsets.only(top: 8.0),
+                        child: FriendRequestNotificationCard(
+                          notification: item,
+                        ),
+                      ),
+                    if (isLegShare)
+                      Padding(
+                        padding: const EdgeInsets.only(top: 8.0),
+                        child: LegShareNotificationCard(notification: item),
                       ),
                   ],
                 ),
@@ -731,10 +812,7 @@ class _MyHomePageState extends State<MyHomePage> {
                 TextButton(
                   onPressed: notifications.isEmpty
                       ? null
-                      : () => _dismissNotifications(
+                      : () => _dismissNotifications(context, dismissibleIds),
-                          context,
-                          notifications.map((e) => e.id).toList(),
-                        ),
                   child: const Text('Dismiss all'),
                 ),
               ],
@@ -769,6 +847,29 @@ class _MyHomePageState extends State<MyHomePage> {
     return '$y-$m-$d $hh:$mm';
   }
 
+  bool _isFriendRequestNotification(UserNotification notification) {
+    final type = notification.type.trim().toLowerCase();
+    final channel = notification.channel.trim().toLowerCase();
+    final title = notification.title.trim().toLowerCase();
+    bool matchesChannel =
+        channel == 'friend_request' || channel == 'friend-request';
+    if (!matchesChannel) {
+      matchesChannel = channel.contains('friend_request') ||
+          channel.contains('friend-request') ||
+          channel.contains('friend');
+    }
+    return matchesChannel ||
+        type == 'friend_request' ||
+        type == 'friend-request' ||
+        title.contains('friend request');
+  }
+
+  bool _isLegShareNotification(UserNotification notification) {
+    final channel = notification.channel.trim().toLowerCase();
+    final type = notification.type.trim().toLowerCase();
+    return channel.contains('leg_share') || type.contains('leg_share');
+  }
+
   Widget _buildBadge(String label) {
     return Container(
       padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 2),
@@ -895,4 +996,10 @@ class _MyHomePageState extends State<MyHomePage> {
     _forwardHistory.clear();
     context.go(tabDestinations[index]);
   }
+
+  @override
+  void dispose() {
+    _notificationsTimer?.cancel();
+    super.dispose();
+  }
 }

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.5.3+1
+version: 0.6.1+4
 
 environment:
   sdk: ^3.8.1