release apk

.gitea/workflows/release.yml

@@ -0,0 +1,327 @@
+name: Release
+
+on:
+  push:
+    branches:
+      - master
+      - dev
+
+env:
+  JAVA_VERSION: "17"
+  ANDROID_SDK_ROOT: "${{ github.workspace }}/android-sdk"
+  FLUTTER_CHANNEL: "stable"
+  BUILD_WINDOWS: "false" # set to "true" when you actually want Windows builds
+  GITEA_BASE_URL: https://git.tgj.services
+
+jobs:
+  meta:
+    runs-on: ubuntu-latest
+    outputs:
+      base_version: ${{ steps.meta.outputs.base }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Determine version
+        id: meta
+        run: |
+          RAW_VERSION=$(awk '/^version:/{print $2}' pubspec.yaml)
+          BASE_VERSION=${RAW_VERSION%%+*}
+          echo "base=${BASE_VERSION}" >> "$GITHUB_OUTPUT"
+
+  android-build:
+    runs-on: ubuntu-latest
+    needs: meta
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install OS deps (Android)
+        run: |
+          if command -v sudo >/dev/null 2>&1; then
+            SUDO="sudo"
+          else
+            SUDO=""
+          fi
+          $SUDO apt-get update
+          $SUDO apt-get install -y unzip xz-utils zip libstdc++6 liblzma-dev curl jq
+
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: ${{ env.JAVA_VERSION }}
+
+      - name: Install Android SDK
+        run: |
+          mkdir -p "$ANDROID_SDK_ROOT"/cmdline-tools
+          curl -fsSL https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip -o /tmp/cli-tools.zip
+          unzip -q /tmp/cli-tools.zip -d "$ANDROID_SDK_ROOT"/cmdline-tools
+          mv "$ANDROID_SDK_ROOT"/cmdline-tools/cmdline-tools "$ANDROID_SDK_ROOT"/cmdline-tools/latest
+
+          # Accept licences (ignore SIGPIPE exit 141)
+          yes | "$ANDROID_SDK_ROOT"/cmdline-tools/latest/bin/sdkmanager --sdk_root="$ANDROID_SDK_ROOT" --licenses || true
+
+          # Install required packages (also ignore SIGPIPE)
+          yes | "$ANDROID_SDK_ROOT"/cmdline-tools/latest/bin/sdkmanager --sdk_root="$ANDROID_SDK_ROOT" \
+            "platform-tools" "platforms;android-33" "build-tools;33.0.2" || true
+
+          echo "ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT" >> "$GITHUB_ENV"
+          echo "$ANDROID_SDK_ROOT/platform-tools" >> "$GITHUB_PATH"
+          echo "$ANDROID_SDK_ROOT/build-tools/33.0.2" >> "$GITHUB_PATH"
+
+      - name: Setup Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: ${{ env.FLUTTER_CHANNEL }}
+
+      - name: Allow all git directories (CI)
+        run: git config --global --add safe.directory '*'
+
+      - name: Flutter dependencies
+        run: flutter pub get
+
+      - name: Prepare Android keystore (optional)
+        if: ${{ secrets.ANDROID_KEYSTORE_BASE64 != '' }}
+        run: |
+          echo "${{ secrets.ANDROID_KEYSTORE_BASE64 }}" | base64 -d > android-release-key.jks
+          echo "ANDROID_KEYSTORE_PATH=$PWD/android-release-key.jks" >> "$GITHUB_ENV"
+          echo "ANDROID_KEYSTORE_PASSWORD=${{ secrets.ANDROID_KEYSTORE_PASSWORD }}" >> "$GITHUB_ENV"
+          echo "ANDROID_KEY_ALIAS=${{ secrets.ANDROID_KEY_ALIAS }}" >> "$GITHUB_ENV"
+          echo "ANDROID_KEY_PASSWORD=${{ secrets.ANDROID_KEY_PASSWORD }}" >> "$GITHUB_ENV"
+
+      - name: Build Android App Bundle (release)
+        run: flutter build appbundle --release
+
+      - name: Download bundletool
+        run: |
+          BUNDLETOOL_VERSION=1.15.6
+          curl -fsSL -o bundletool.jar "https://github.com/google/bundletool/releases/download/${BUNDLETOOL_VERSION}/bundletool-all-${BUNDLETOOL_VERSION}.jar"
+
+      - name: Extract universal APK from bundle
+        env:
+          BASE_VERSION: ${{ needs.meta.outputs.base_version }}
+        run: |
+          set -euo pipefail
+
+          BUNDLE="build/app/outputs/bundle/release/app-release.aab"
+          OUTPUT_APKS="app-release.apks"
+          APK_NAME="mileograph-${BASE_VERSION}.apk"
+
+          if [ ! -f "$BUNDLE" ]; then
+            echo "Bundle not found at $BUNDLE"
+            exit 1
+          fi
+
+          SIGNING_ARGS=()
+          if [ -n "${ANDROID_KEYSTORE_PATH:-}" ] && [ -f "$ANDROID_KEYSTORE_PATH" ]; then
+            SIGNING_ARGS+=(--ks="$ANDROID_KEYSTORE_PATH")
+            SIGNING_ARGS+=(--ks-pass="pass:${ANDROID_KEYSTORE_PASSWORD}")
+            SIGNING_ARGS+=(--ks-key-alias="${ANDROID_KEY_ALIAS}")
+            KEY_PASS="${ANDROID_KEY_PASSWORD:-$ANDROID_KEYSTORE_PASSWORD}"
+            SIGNING_ARGS+=(--key-pass="pass:${KEY_PASS}")
+          else
+            echo "No release keystore provided; bundletool will sign with the debug keystore."
+          fi
+
+          java -jar bundletool.jar build-apks \
+            --bundle="$BUNDLE" \
+            --output="$OUTPUT_APKS" \
+            --mode=universal \
+            "${SIGNING_ARGS[@]}"
+
+          unzip -p "$OUTPUT_APKS" universal.apk > "$APK_NAME"
+          ls -lh "$APK_NAME"
+
+      - name: Upload Android APK artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: android-apk
+          path: mileograph-${{ needs.meta.outputs.base_version }}.apk
+
+  linux-build:
+    runs-on: ubuntu-latest
+    needs: meta
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install OS deps (Linux desktop)
+        run: |
+          if command -v sudo >/dev/null 2>&1; then
+            SUDO="sudo"
+          else
+            SUDO=""
+          fi
+          $SUDO apt-get update
+          $SUDO apt-get install -y unzip xz-utils zip libstdc++6 libglu1-mesa clang cmake ninja-build pkg-config libgtk-3-dev libsecret-1-dev liblzma-dev curl jq
+
+      - name: Setup Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: ${{ env.FLUTTER_CHANNEL }}
+
+      - name: Allow all git directories (CI)
+        run: git config --global --add safe.directory '*'
+
+      - name: Flutter dependencies
+        run: flutter pub get
+
+      - name: Enable Linux desktop
+        run: flutter config --enable-linux-desktop
+
+      - name: Build Linux binary (release)
+        run: |
+          flutter build linux --release
+          tar -C build/linux/x64/release/bundle -czf app-linux-x64.tar.gz .
+
+      - name: Upload Linux artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: linux-bundle
+          path: app-linux-x64.tar.gz
+
+  release-dev:
+    runs-on: ubuntu-latest
+    needs:
+      - meta
+      - android-build
+      - linux-build
+    steps:
+      - name: Install jq
+        run: |
+          if command -v sudo >/dev/null 2>&1; then
+            SUDO="sudo"
+          else
+            SUDO=""
+          fi
+          $SUDO apt-get update
+          $SUDO apt-get install -y jq
+      - name: Download Android APK
+        if: ${{ github.ref == 'refs/heads/dev' }}
+        uses: actions/download-artifact@v3
+        with:
+          name: android-apk
+          path: artifacts
+
+      - name: Prepare APK and tag
+        if: ${{ github.ref == 'refs/heads/dev' }}
+        id: bundle
+        run: |
+          BASE="${{ needs.meta.outputs.base_version }}"
+          TAG="v${BASE}-dev.${{ github.run_number }}"
+
+          mv "artifacts/mileograph-${BASE}.apk" "artifacts/mileograph-${BASE}-dev.apk"
+
+          echo "tag=${TAG}" >> "$GITHUB_OUTPUT"
+          echo "apk=artifacts/mileograph-${BASE}-dev.apk" >> "$GITHUB_OUTPUT"
+
+      - name: Create prerelease on Gitea
+        if: ${{ github.ref == 'refs/heads/dev' }}
+        uses: ncipollo/release-action@v1
+        with:
+          tag: ${{ steps.bundle.outputs.tag }}
+          name: v${{ needs.meta.outputs.base_version }}-dev build ${{ github.run_number }}
+          prerelease: true
+          commit: ${{ github.sha }}
+          token: ${{ secrets.GITEA_TOKEN }}
+          # NOTE: no `artifacts:` here
+
+      - name: Attach APK to Gitea release
+        if: ${{ github.ref == 'refs/heads/dev' }}
+        run: |
+          set -euo pipefail
+
+          TAG="${{ steps.bundle.outputs.tag }}"
+          APK="${{ steps.bundle.outputs.apk }}"
+
+          # 1. Find release ID by tag
+          RELEASE_JSON=$(curl -sS \
+            -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
+            "${GITEA_BASE_URL}/api/v1/repos/${{ github.repository }}/releases/tags/${TAG}")
+
+          RELEASE_ID=$(echo "$RELEASE_JSON" | jq -r '.id')
+
+          echo "Release ID: $RELEASE_ID"
+
+          # 2. Upload APK with multipart/form-data
+          NAME=$(basename "$APK")
+          echo "Uploading $NAME"
+
+          curl -sS -X POST \
+            -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
+            -F "attachment=@${APK}" \
+            -F "name=${NAME}" \
+            "${GITEA_BASE_URL}/api/v1/repos/${{ github.repository }}/releases/${RELEASE_ID}/assets" \
+            >/dev/null
+
+  release-master:
+    runs-on: ubuntu-latest
+    needs:
+      - meta
+      - android-build
+      - linux-build
+    steps:
+      - name: Install jq
+        run: |
+          if command -v sudo >/dev/null 2>&1; then
+            SUDO="sudo"
+          else
+            SUDO=""
+          fi
+          $SUDO apt-get update
+          $SUDO apt-get install -y jq
+      - name: Download Android APK
+        if: ${{ github.ref == 'refs/heads/master' }}
+        uses: actions/download-artifact@v3
+        with:
+          name: android-apk
+          path: artifacts
+
+      - name: Prepare APK and tag
+        if: ${{ github.ref == 'refs/heads/master' }}
+        id: bundle
+        run: |
+          BASE="${{ needs.meta.outputs.base_version }}"
+          TAG="v${BASE}"
+
+          echo "tag=${TAG}" >> "$GITHUB_OUTPUT"
+          echo "apk=artifacts/mileograph-${BASE}.apk" >> "$GITHUB_OUTPUT"
+
+      - name: Create release on Gitea
+        if: ${{ github.ref == 'refs/heads/master' }}
+        uses: ncipollo/release-action@v1
+        with:
+          tag: ${{ steps.bundle.outputs.tag }}
+          name: ${{ steps.bundle.outputs.tag }}
+          prerelease: false
+          token: ${{ secrets.GITEA_TOKEN }}
+          commit: ${{ github.sha }}
+
+      - name: Attach APK to Gitea release
+        if: ${{ github.ref == 'refs/heads/master' }}
+        run: |
+          set -euo pipefail
+
+          TAG="${{ steps.bundle.outputs.tag }}"
+          APK="${{ steps.bundle.outputs.apk }}"
+
+          # 1. Find release ID by tag
+          RELEASE_JSON=$(curl -sS \
+            -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
+            "${GITEA_BASE_URL}/api/v1/repos/${{ github.repository }}/releases/tags/${TAG}")
+
+          RELEASE_ID=$(echo "$RELEASE_JSON" | jq -r '.id')
+
+          echo "Release ID: $RELEASE_ID"
+
+          # 2. Upload APK with multipart/form-data
+          NAME=$(basename "$APK")
+          echo "Uploading $NAME"
+
+          curl -sS -X POST \
+            -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
+            -F "attachment=@${APK}" \
+            -F "name=${NAME}" \
+            "${GITEA_BASE_URL}/api/v1/repos/${{ github.repository }}/releases/${RELEASE_ID}/assets" \
+            >/dev/null

.gitignore

@@ -43,3 +43,5 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
+
+api_return_examples.txt

android/app/build.gradle.kts

@@ -1,3 +1,5 @@
+import java.util.Properties
+
 plugins {
     id("com.android.application")
     id("kotlin-android")
@@ -5,6 +7,28 @@ plugins {
     id("dev.flutter.flutter-gradle-plugin")
 }
 
+val keystoreProperties = Properties()
+val keystorePropertiesFile = rootProject.file("key.properties")
+if (keystorePropertiesFile.exists()) {
+    keystorePropertiesFile.inputStream().use { keystoreProperties.load(it) }
+}
+
+val releaseStoreFile = System.getenv("ANDROID_KEYSTORE_PATH")
+    ?: keystoreProperties.getProperty("storeFile")
+val releaseStorePassword = System.getenv("ANDROID_KEYSTORE_PASSWORD")
+    ?: keystoreProperties.getProperty("storePassword")
+val releaseKeyAlias = System.getenv("ANDROID_KEY_ALIAS")
+    ?: keystoreProperties.getProperty("keyAlias")
+val releaseKeyPassword = System.getenv("ANDROID_KEY_PASSWORD")
+    ?: keystoreProperties.getProperty("keyPassword")
+
+val hasReleaseKeystore = listOf(
+    releaseStoreFile,
+    releaseStorePassword,
+    releaseKeyAlias,
+    releaseKeyPassword
+).all { !it.isNullOrBlank() }
+
 android {
     namespace = "com.example.mileograph_flutter"
     compileSdk = flutter.compileSdkVersion
@@ -30,11 +54,21 @@ android {
         versionName = flutter.versionName
     }
 
+    signingConfigs {
+        if (hasReleaseKeystore) {
+            create("release") {
+                storeFile = file(releaseStoreFile!!)
+                storePassword = releaseStorePassword
+                keyAlias = releaseKeyAlias!!
+                keyPassword = releaseKeyPassword
+            }
+        }
+    }
+
     buildTypes {
         release {
-            // TODO: Add your own signing config for the release build.
+            // Use a real release keystore when provided; fall back to debug keys otherwise.
-            // Signing with the debug keys for now, so `flutter run --release` works.
+            signingConfig = signingConfigs.getByName(if (hasReleaseKeystore) "release" else "debug")
-            signingConfig = signingConfigs.getByName("debug")
         }
     }
 }

lib/components/calculator/calculator.dart

@@ -97,7 +97,10 @@ class _StationAutocompleteState extends State<StationAutocomplete> {
 }
 
 class RouteCalculator extends StatefulWidget {
-  const RouteCalculator({super.key});
+  const RouteCalculator({super.key, this.onDistanceComputed, this.onApplyRoute});
+
+  final ValueChanged<double>? onDistanceComputed;
+  final ValueChanged<RouteResult>? onApplyRoute;
 
   @override
   State<RouteCalculator> createState() => _RouteCalculatorState();
@@ -143,11 +146,11 @@ class _RouteCalculatorState extends State<RouteCalculator> {
       setState(() {
         _routeResult = RouteResult.fromJson(res);
       });
+      final distance = (_routeResult?.distance ?? 0);
+      widget.onDistanceComputed?.call(distance);
     } else {
       setState(() {
-        _errorMessage =
+        _errorMessage = RouteError.fromJson(res["error_obj"][0]).msg;
-            RouteError.fromJson(res["error_obj"][0]).msg ??
-            'Unknown error occurred';
       });
     }
   }
@@ -248,11 +251,21 @@ class _RouteCalculatorState extends State<RouteCalculator> {
               style: TextStyle(color: Theme.of(context).colorScheme.error),
             ),
           )
-        else if (_routeResult != null)
+        else if (_routeResult != null) ...[
           RouteSummaryWidget(
             distance: _routeResult!.distance,
             onDetailsPressed: () => setState(() => _showDetails = true),
-          )
+          ),
+          if (widget.onApplyRoute != null)
+            Padding(
+              padding: const EdgeInsets.symmetric(horizontal: 16.0),
+              child: ElevatedButton.icon(
+                onPressed: () => widget.onApplyRoute!(_routeResult!),
+                icon: const Icon(Icons.check),
+                label: const Text('Apply to entry'),
+              ),
+            ),
+        ]
         else
           SizedBox.shrink(),
         const SizedBox(height: 10),

lib/components/dashboard/leaderboardPanel.dart

@@ -4,8 +4,18 @@ import 'package:mileograph_flutter/services/dataService.dart';
 import 'package:provider/provider.dart';
 
 class LeaderboardPanel extends StatelessWidget {
+  const LeaderboardPanel({super.key});
+
+  @override
   Widget build(BuildContext context) {
     final data = context.watch<DataService>();
+    final leaderboard = data.homepageStats?.leaderboard ?? [];
+    if (data.isHomepageLoading && leaderboard.isEmpty) {
+      return const Padding(
+        padding: EdgeInsets.all(16.0),
+        child: Center(child: CircularProgressIndicator()),
+      );
+    }
     return Padding(
       padding: const EdgeInsets.all(10.0),
       child: Card(
@@ -20,19 +30,23 @@ class LeaderboardPanel extends StatelessWidget {
                 decoration: TextDecoration.underline,
               ),
             ),
+            if (leaderboard.isEmpty)
+              const Padding(
+                padding: EdgeInsets.all(16.0),
+                child: Text('No leaderboard data yet'),
+              )
+            else
               Column(
                 children: List.generate(
-                data.homepageStats?.leaderboard.length ?? 0,
+                  leaderboard.length,
                   (index) {
-                  final leaderboardEntry =
+                    final leaderboardEntry = leaderboard[index];
-                      data.homepageStats!.leaderboard[index];
                     return Container(
                       width: double.infinity,
-                    child: Container(
+                      margin: const EdgeInsets.symmetric(
-                      margin: EdgeInsets.symmetric(horizontal: 0, vertical: 8),
+                          horizontal: 0, vertical: 8),
                       child: Padding(
-                        padding: EdgeInsets.all(8),
+                        padding: const EdgeInsets.all(8),
-
                         child: Row(
                           mainAxisAlignment: MainAxisAlignment.spaceBetween,
                           children: [
@@ -41,12 +55,12 @@ class LeaderboardPanel extends StatelessWidget {
                                 children: [
                                   TextSpan(
                                     text: '${index + 1}. ',
-                                    style: TextStyle(
+                                    style: const TextStyle(
                                       fontWeight: FontWeight.bold,
                                     ),
                                   ),
                                   TextSpan(
-                                    text: '${leaderboardEntry.userFullName}',
+                                    text: leaderboardEntry.userFullName,
                                   ),
                                 ],
                               ),
@@ -57,7 +71,6 @@ class LeaderboardPanel extends StatelessWidget {
                           ],
                         ),
                       ),
-                    ),
                     );
                   },
                 ),

lib/components/dashboard/topTractionPanel.dart

@@ -4,8 +4,19 @@ import 'package:mileograph_flutter/services/dataService.dart';
 import 'package:provider/provider.dart';
 
 class TopTractionPanel extends StatelessWidget {
+  const TopTractionPanel({super.key});
+
+  @override
   Widget build(BuildContext context) {
     final data = context.watch<DataService>();
+    final stats = data.homepageStats;
+    final locos = stats?.topLocos ?? [];
+    if (data.isHomepageLoading && locos.isEmpty) {
+      return const Padding(
+        padding: EdgeInsets.all(16.0),
+        child: Center(child: CircularProgressIndicator()),
+      );
+    }
     return Padding(
       padding: const EdgeInsets.all(10.0),
       child: Card(
@@ -20,18 +31,23 @@ class TopTractionPanel extends StatelessWidget {
                 decoration: TextDecoration.underline,
               ),
             ),
+            if (locos.isEmpty)
+              const Padding(
+                padding: EdgeInsets.all(16.0),
+                child: Text('No traction data yet'),
+              )
+            else
               Column(
                 children: List.generate(
-                data.homepageStats?.topLocos.length ?? 0,
+                  locos.length,
                   (index) {
-                  final loco = data.homepageStats!.topLocos[index];
+                    final loco = locos[index];
                     return Container(
                       width: double.infinity,
-                    child: Container(
+                      margin:
-                      margin: EdgeInsets.symmetric(horizontal: 0, vertical: 8),
+                          const EdgeInsets.symmetric(horizontal: 0, vertical: 8),
                       child: Padding(
-                        padding: EdgeInsets.all(8),
+                        padding: const EdgeInsets.all(8),
-
                         child: Row(
                           mainAxisAlignment: MainAxisAlignment.spaceBetween,
                           children: [
@@ -43,7 +59,7 @@ class TopTractionPanel extends StatelessWidget {
                                     children: [
                                       TextSpan(
                                         text: '${index + 1}. ',
-                                        style: TextStyle(
+                                        style: const TextStyle(
                                           fontWeight: FontWeight.bold,
                                         ),
                                       ),
@@ -55,8 +71,9 @@ class TopTractionPanel extends StatelessWidget {
                                   ),
                                 ),
                                 Text(
-                                  '${loco.name}',
+                                  loco.name ?? '',
-                                  style: TextStyle(fontStyle: FontStyle.italic),
+                                  style:
+                                      const TextStyle(fontStyle: FontStyle.italic),
                                 ),
                               ],
                             ),
@@ -64,7 +81,6 @@ class TopTractionPanel extends StatelessWidget {
                           ],
                         ),
                       ),
-                    ),
                     );
                   },
                 ),

lib/components/login/login.dart

@@ -13,7 +13,6 @@ class LoginScreen extends StatelessWidget {
         color: Theme.of(context).scaffoldBackgroundColor,
         child: Center(
           child: Column(
-            spacing: 50,
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
               Text.rich(
@@ -44,6 +43,7 @@ class LoginScreen extends StatelessWidget {
                 ),
               ),
             ),
+            const SizedBox(height: 50),
             LoginPanel(),
           ],
         ),
@@ -115,7 +115,7 @@ class _LoginPanelContentState extends State<LoginPanelContent> {
 
   bool _loggingIn = false;
 
-  void login() async {
+  Future<void> login() async {
     final username = _usernameController.text;
     final password = _passwordController.text;
 
@@ -126,19 +126,18 @@ class _LoginPanelContentState extends State<LoginPanelContent> {
     });
     try {
       await auth.login(username, password);
-      print('Login successful');
+      if (!mounted) return;
       setState(() {
         _loggingIn = false;
       });
     } catch (e) {
-      // Handle error
+      if (!mounted) return;
-      print('Login failed: $e');
       setState(() {
         _loggingIn = false;
       });
-      ScaffoldMessenger.of(
+      ScaffoldMessenger.of(context).showSnackBar(
-        context,
+        SnackBar(content: Text('Login failed: $e')),
-      ).showSnackBar(SnackBar(content: Text('Login failed')));
+      );
     }
   }
 
@@ -163,7 +162,6 @@ class _LoginPanelContentState extends State<LoginPanelContent> {
     return Column(
       mainAxisAlignment: MainAxisAlignment.center,
       mainAxisSize: MainAxisSize.min,
-      spacing: 8,
       children: [
         Padding(
           padding: const EdgeInsets.symmetric(vertical: 0, horizontal: 50),
@@ -172,6 +170,7 @@ class _LoginPanelContentState extends State<LoginPanelContent> {
             style: TextStyle(fontWeight: FontWeight.bold, fontSize: 20),
           ),
         ),
+        const SizedBox(height: 8),
         TextFormField(
           controller: _usernameController,
           decoration: InputDecoration(
@@ -180,6 +179,7 @@ class _LoginPanelContentState extends State<LoginPanelContent> {
           ),
           onFieldSubmitted: (_) => login(),
         ),
+        const SizedBox(height: 8),
         TextFormField(
           controller: _passwordController,
           obscureText: true,
@@ -189,11 +189,12 @@ class _LoginPanelContentState extends State<LoginPanelContent> {
           ),
           onFieldSubmitted: (_) => login(),
         ),
+        const SizedBox(height: 12),
         Row(
           mainAxisAlignment: MainAxisAlignment.center,
-          spacing: 10,
           children: [
             FilledButton(onPressed: login, child: loginButtonContent),
+            const SizedBox(width: 10),
             ElevatedButton(
               onPressed: widget.registerCb,
               child: Text("Register"),
@@ -205,7 +206,7 @@ class _LoginPanelContentState extends State<LoginPanelContent> {
   }
 }
 
-class RegisterPanelContent extends StatelessWidget {
+class RegisterPanelContent extends StatefulWidget {
   const RegisterPanelContent({
     super.key,
     required this.onBack,
@@ -213,20 +214,64 @@ class RegisterPanelContent extends StatelessWidget {
   });
   final VoidCallback onBack;
   final AuthService authService;
-  void register() {}
+  @override
+  State<RegisterPanelContent> createState() => _RegisterPanelContentState();
+}
+
+class _RegisterPanelContentState extends State<RegisterPanelContent> {
+  final _usernameController = TextEditingController();
+  final _displayNameController = TextEditingController();
+  final _emailController = TextEditingController();
+  final _passwordController = TextEditingController();
+  final _inviteController = TextEditingController();
+  bool _registering = false;
+
+  @override
+  void dispose() {
+    _usernameController.dispose();
+    _displayNameController.dispose();
+    _emailController.dispose();
+    _passwordController.dispose();
+    _inviteController.dispose();
+    super.dispose();
+  }
+
+  Future<void> _register() async {
+    setState(() => _registering = true);
+    try {
+      await widget.authService.register(
+        username: _usernameController.text.trim(),
+        email: _emailController.text.trim(),
+        fullName: _displayNameController.text.trim(),
+        password: _passwordController.text,
+        inviteCode: _inviteController.text.trim(),
+      );
+      if (!mounted) return;
+      ScaffoldMessenger.of(context).showSnackBar(
+        const SnackBar(content: Text('Registration successful. Please log in.')),
+      );
+      widget.onBack();
+    } catch (e) {
+      if (!mounted) return;
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('Registration failed: $e')),
+      );
+    } finally {
+      if (mounted) setState(() => _registering = false);
+    }
+  }
 
   @override
   Widget build(BuildContext context) {
     return Column(
       mainAxisAlignment: MainAxisAlignment.center,
       mainAxisSize: MainAxisSize.min,
-      spacing: 8,
       children: [
         Row(
           children: [
             IconButton(
-              icon: Icon(Icons.arrow_back),
+              icon: const Icon(Icons.arrow_back),
-              onPressed: onBack,
+              onPressed: widget.onBack,
               tooltip: 'Back to login',
             ),
             Expanded(
@@ -237,47 +282,64 @@ class RegisterPanelContent extends StatelessWidget {
                 ),
               ),
             ),
-            // Spacer to balance the row visually
+            const SizedBox(width: 48),
-            SizedBox(width: 48), // matches IconButton size
           ],
         ),
-        SizedBox(height: 16),
+        const SizedBox(height: 16),
         TextField(
-          decoration: InputDecoration(
+          controller: _usernameController,
+          decoration: const InputDecoration(
             border: OutlineInputBorder(),
             labelText: "Username",
           ),
         ),
+        const SizedBox(height: 8),
         TextField(
-          decoration: InputDecoration(
+          controller: _displayNameController,
+          decoration: const InputDecoration(
             border: OutlineInputBorder(),
             labelText: "Display Name",
           ),
         ),
+        const SizedBox(height: 8),
         TextField(
-          decoration: InputDecoration(
+          controller: _emailController,
+          decoration: const InputDecoration(
             border: OutlineInputBorder(),
             labelText: "Email",
           ),
         ),
+        const SizedBox(height: 8),
         TextField(
+          controller: _passwordController,
           obscureText: true,
-          decoration: InputDecoration(
+          decoration: const InputDecoration(
             border: OutlineInputBorder(),
             labelText: "Password",
           ),
         ),
+        const SizedBox(height: 8),
         TextField(
-          decoration: InputDecoration(
+          controller: _inviteController,
+          decoration: const InputDecoration(
             border: OutlineInputBorder(),
             labelText: "Invite Code",
           ),
         ),
+        const SizedBox(height: 12),
         Row(
           mainAxisAlignment: MainAxisAlignment.center,
-          spacing: 10,
           children: [
-            FilledButton(onPressed: register, child: Text("Register")),
+            FilledButton(
+              onPressed: _registering ? null : _register,
+              child: _registering
+                  ? const SizedBox(
+                      height: 14,
+                      width: 14,
+                      child: CircularProgressIndicator(strokeWidth: 2),
+                    )
+                  : const Text("Register"),
+            ),
           ],
         ),
       ],

lib/components/pages/calculator.dart

@@ -1,10 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:mileograph_flutter/components/calculator/calculator.dart';
-import 'package:provider/provider.dart';
-import 'package:mileograph_flutter/services/dataService.dart';
 
 class CalculatorPage extends StatelessWidget {
+  const CalculatorPage({super.key});
+
+  @override
   Widget build(BuildContext context) {
-    return RouteCalculator();
+    return const RouteCalculator();
   }
 }

lib/components/pages/dashboard.dart

@@ -1,98 +1,365 @@
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 import 'package:mileograph_flutter/components/dashboard/leaderboardPanel.dart';
+import 'package:mileograph_flutter/components/dashboard/topTractionPanel.dart';
+import 'package:mileograph_flutter/objects/objects.dart';
 import 'package:mileograph_flutter/services/authservice.dart';
 import 'package:mileograph_flutter/services/dataService.dart';
-import 'package:mileograph_flutter/components/dashboard/topTractionPanel.dart';
-
 import 'package:provider/provider.dart';
 
-class Dashboard extends StatelessWidget {
+class Dashboard extends StatefulWidget {
   const Dashboard({super.key});
+
+  @override
+  State<Dashboard> createState() => _DashboardState();
+}
+
+class _DashboardState extends State<Dashboard> {
+  bool _showAllOnThisDay = false;
+
   @override
   Widget build(BuildContext context) {
     final data = context.watch<DataService>();
     final auth = context.watch<AuthService>();
-    return DashboardHeader(auth: auth, data: data);
+    final stats = data.homepageStats;
+
+    final isInitialLoading = data.isHomepageLoading || stats == null;
+
+    return RefreshIndicator(
+      onRefresh: () async {
+        await data.fetchHomepageStats();
+        await Future.wait([
+          data.fetchOnThisDay(),
+          data.fetchTripDetails(),
+          data.fetchHadTraction(),
+        ]);
+      },
+      child: LayoutBuilder(
+        builder: (context, constraints) {
+          final isWide = constraints.maxWidth > 1100;
+          final metricChips = _buildMetricChips(
+            context,
+            totalMileage: stats?.totalMileage ?? 0,
+            currentYearMileage: data.getMileageForCurrentYear(),
+            trips: data.trips.length,
+          );
+          return Stack(
+            children: [
+              ListView(
+                padding: const EdgeInsets.all(16),
+                children: [
+                  _buildHeader(context, auth, stats, data.isHomepageLoading),
+                  const SizedBox(height: 12),
+                  Wrap(spacing: 12, runSpacing: 12, children: metricChips),
+                  const SizedBox(height: 16),
+                  isWide
+                      ? Row(
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: [
+                            Expanded(child: _buildMainColumn(context, data)),
+                            const SizedBox(width: 16),
+                            SizedBox(
+                              width: 360,
+                              child: _buildSidebar(context, data),
+                            ),
+                          ],
+                        )
+                      : Column(
+                          children: [
+                            _buildMainColumn(context, data),
+                            const SizedBox(height: 16),
+                            _buildSidebar(context, data),
+                          ],
+                        ),
+                ],
+              ),
+              if (isInitialLoading)
+                Positioned.fill(
+                  child: Container(
+                    color:
+                        Theme.of(context).colorScheme.surface.withOpacity(0.7),
+                    child: const Center(
+                      child: Column(
+                        mainAxisSize: MainAxisSize.min,
+                        children: [
+                          CircularProgressIndicator(),
+                          SizedBox(height: 12),
+                          Text('Loading dashboard data...'),
+                        ],
+                      ),
+                    ),
+                  ),
+                ),
+            ],
+          );
+        },
+      ),
+    );
   }
-}
 
-class DashboardHeader extends StatelessWidget {
+  Widget _buildHeader(
-  const DashboardHeader({super.key, required this.auth, required this.data});
+    BuildContext context,
-
+    AuthService auth,
-  final AuthService auth;
+    HomepageStats? stats,
-  final DataService data;
+    bool loading,
-
+  ) {
-  @override
+    final greetingName =
-  Widget build(BuildContext context) {
+        stats?.user?.full_name ?? auth.fullName ?? auth.username ?? 'there';
-    return Column(
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+      crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        Row(
+        Column(
-          mainAxisAlignment: MainAxisAlignment.center,
+          crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            Row(
+            Text('Dashboard', style: Theme.of(context).textTheme.labelMedium),
-              children: [
+            const SizedBox(height: 2),
-                Card(
+            Text(
-                  child: Padding(
+              'Welcome back, $greetingName',
-                    padding: const EdgeInsets.all(8.0),
+              style: Theme.of(context).textTheme.headlineSmall,
-                    child: Column(
-                      children: [
-                        Text.rich(
-                          TextSpan(
-                            children: [
-                              TextSpan(text: "Total Mileage: "),
-                              TextSpan(
-                                text:
-                                    data.homepageStats?.totalMileage
-                                        .toString() ??
-                                    "0",
             ),
           ],
         ),
-                        ),
+        if (loading)
-                        Text.rich(
+          const Padding(
-                          TextSpan(
+            padding: EdgeInsets.only(right: 8.0),
-                            children: [
+            child: SizedBox(
-                              TextSpan(text: DateTime.now().year.toString()),
+              height: 24,
-                              TextSpan(text: " Mileage: "),
+              width: 24,
-                              TextSpan(
+              child: CircularProgressIndicator(strokeWidth: 2),
-                                text: data
-                                    .getMileageForCurrentYear()
-                                    .toString(),
-                              ),
-                            ],
-                          ),
-                        ),
-                      ],
-                    ),
-                  ),
-                ),
-                Card(
-                  child: Padding(
-                    padding: EdgeInsets.all(8),
-                    child: Column(
-                      children: [
-                        Text("Total Winners: 123"),
-                        Text("Average mileage: 45.6"),
-                      ],
-                    ),
-                  ),
-                ),
-              ],
-            ),
-          ],
-        ),
-
-        Expanded(
-          child: ListView(
-            scrollDirection: Axis.vertical,
-            children: [
-              TopTractionPanel(),
-              LeaderboardPanel(),
-              SizedBox(height: 80),
-            ],
             ),
           ),
       ],
     );
   }
+
+  List<Widget> _buildMetricChips(
+    BuildContext context, {
+    required double totalMileage,
+    required double currentYearMileage,
+    required int trips,
+  }) {
+    final textTheme = Theme.of(context).textTheme;
+    Widget metricCard(String label, String value) {
+      return Card(
+        elevation: 1,
+        child: Padding(
+          padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 14),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              Text(
+                label.toUpperCase(),
+                style: textTheme.labelSmall?.copyWith(
+                  letterSpacing: 0.7,
+                  color: textTheme.bodySmall?.color?.withOpacity(0.7),
+                ),
+              ),
+              const SizedBox(height: 4),
+              Text(
+                value,
+                style: textTheme.titleMedium?.copyWith(
+                  fontWeight: FontWeight.w700,
+                ),
+              ),
+            ],
+          ),
+        ),
+      );
+    }
+
+    return [
+      metricCard('Total mileage', '${totalMileage.toStringAsFixed(1)} mi'),
+      metricCard('This year', '${currentYearMileage.toStringAsFixed(1)} mi'),
+      metricCard('Trips logged', trips.toString()),
+    ];
+  }
+
+  Widget _buildMainColumn(BuildContext context, DataService data) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.stretch,
+      children: [
+        _buildCard(
+          context,
+          title: 'On this day',
+          action: data.onThisDay
+                      .where((leg) => leg.beginTime.year != DateTime.now().year)
+                      .length >
+                  5
+              ? TextButton(
+                  onPressed: () => setState(() {
+                    _showAllOnThisDay = !_showAllOnThisDay;
+                  }),
+                  child: Text(_showAllOnThisDay ? 'Show less' : 'Show more'),
+                )
+              : null,
+          trailing: data.isOnThisDayLoading
+              ? const SizedBox(
+                  height: 18,
+                  width: 18,
+                  child: CircularProgressIndicator(strokeWidth: 2),
+                )
+              : null,
+          child: _buildLegList(
+            context,
+            data.onThisDay,
+            showAll: _showAllOnThisDay,
+            emptyMessage: 'No historical moves for today yet.',
+          ),
+        ),
+        const SizedBox(height: 12),
+        _buildQuickCalcCard(context),
+        const SizedBox(height: 12),
+        _buildTripsCard(context, data),
+      ],
+    );
+  }
+
+  Widget _buildSidebar(BuildContext context, DataService data) {
+    return Column(
+      children: [
+        TopTractionPanel(),
+        const SizedBox(height: 12),
+        LeaderboardPanel(),
+      ],
+    );
+  }
+
+  Widget _buildCard(
+    BuildContext context, {
+    required String title,
+    required Widget child,
+    Widget? trailing,
+    Widget? action,
+  }) {
+    return Card(
+      clipBehavior: Clip.antiAlias,
+      child: Padding(
+        padding: const EdgeInsets.all(16),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.stretch,
+          children: [
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                Text(
+                  title,
+                  style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                    fontWeight: FontWeight.w700,
+                  ),
+                ),
+                Row(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    if (action != null) action,
+                    if (trailing != null) ...[
+                      const SizedBox(width: 8),
+                      trailing,
+                    ],
+                  ],
+                ),
+              ],
+            ),
+            const SizedBox(height: 12),
+            child,
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildLegList(
+    BuildContext context,
+    List<Leg> legs, {
+    required String emptyMessage,
+    bool showAll = false,
+  }) {
+    final filtered = legs
+        .where((leg) => leg.beginTime.year != DateTime.now().year)
+        .toList();
+    if (filtered.isEmpty) {
+      return Text(emptyMessage, style: Theme.of(context).textTheme.bodyMedium);
+    }
+    final toShow = showAll ? filtered : filtered.take(5).toList();
+    return Column(
+      children: toShow.map((leg) {
+        return ListTile(
+          dense: true,
+          contentPadding: EdgeInsets.zero,
+          leading: CircleAvatar(
+            backgroundColor: Theme.of(context).colorScheme.primaryContainer,
+            child: const Icon(Icons.train),
+          ),
+          title: Text('${leg.start} → ${leg.end}'),
+          subtitle: Text(_formatDate(leg.beginTime)),
+          trailing: Column(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              Text('${leg.mileage.toStringAsFixed(1)} mi'),
+              if (leg.headcode.isNotEmpty)
+                Text(
+                  leg.headcode,
+                  style: Theme.of(context).textTheme.labelSmall?.copyWith(
+                    color: Theme.of(context).hintColor,
+                  ),
+                ),
+            ],
+          ),
+        );
+      }).toList(),
+    );
+  }
+
+  Widget _buildQuickCalcCard(BuildContext context) {
+    return _buildCard(
+      context,
+      title: 'Quick mileage calculator',
+      action: TextButton.icon(
+        onPressed: () => context.push('/calculator'),
+        icon: const Icon(Icons.open_in_new),
+        label: const Text('Open calculator'),
+      ),
+      child: Text(
+        'Jump into the route calculator to quickly total a journey before saving it.',
+        style: Theme.of(context).textTheme.bodyMedium,
+      ),
+    );
+  }
+
+  Widget _buildTripsCard(BuildContext context, DataService data) {
+    final trips_unsorted = data.trips;
+    List trips = [];
+    if (trips_unsorted.isNotEmpty) {
+      trips = [...trips_unsorted]..sort((a, b) => b.tripId.compareTo(a.tripId));
+    }
+    return _buildCard(
+      context,
+      title: 'Trips',
+      action: TextButton(
+        onPressed: () => context.push('/trips'),
+        child: const Text('View all'),
+      ),
+      child: trips.isEmpty
+          ? Text(
+              'No trips logged yet. Add one from the Trips page.',
+              style: Theme.of(context).textTheme.bodyMedium,
+            )
+          : Column(
+              children: trips.take(5).map((trip) {
+                return ListTile(
+                  contentPadding: EdgeInsets.zero,
+                  title: Text(trip.tripName),
+                  subtitle: Text('${trip.tripMileage.toStringAsFixed(1)} mi'),
+                  trailing: const Icon(Icons.chevron_right),
+                );
+              }).toList(),
+            ),
+    );
+  }
+
+  String _formatDate(DateTime? dt) {
+    if (dt == null) return '';
+    return '${dt.year.toString().padLeft(4, '0')}-${dt.month.toString().padLeft(2, '0')}-${dt.day.toString().padLeft(2, '0')}';
+  }
 }

lib/components/pages/legs.dart

@@ -1,31 +1,398 @@
+import 'dart:convert';
+
 import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
+import 'package:mileograph_flutter/objects/objects.dart';
 import 'package:mileograph_flutter/services/dataService.dart';
+import 'package:provider/provider.dart';
 
+class LegsPage extends StatefulWidget {
+  const LegsPage({super.key});
 
-class LegsPage extends StatelessWidget {
+  @override
-  Widget build(BuildContext context){
+  State<LegsPage> createState() => _LegsPageState();
+}
+
+class _LegsPageState extends State<LegsPage> {
+  int _sortDirection = 0;
+  DateTime? _startDate;
+  DateTime? _endDate;
+  bool _initialised = false;
+
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    if (!_initialised) {
+      _initialised = true;
+      _refreshLegs();
+    }
+  }
+
+  Future<void> _refreshLegs() async {
+    final data = context.read<DataService>();
+    await data.fetchLegs(
+      sortDirection: _sortDirection,
+      dateRangeStart: _formatDate(_startDate),
+      dateRangeEnd: _formatDate(_endDate),
+    );
+  }
+
+  Future<void> _loadMore() async {
+    final data = context.read<DataService>();
+    await data.fetchLegs(
+      sortDirection: _sortDirection,
+      dateRangeStart: _formatDate(_startDate),
+      dateRangeEnd: _formatDate(_endDate),
+      offset: data.legs.length,
+      append: true,
+    );
+  }
+
+  double _pageMileage(List legs) {
+    return legs.fold<double>(
+      0,
+      (prev, leg) => prev + (leg.mileage as double? ?? 0),
+    );
+  }
+
+  Future<void> _pickDate({required bool start}) async {
+    final initial = start
+        ? _startDate ?? DateTime.now()
+        : _endDate ?? _startDate ?? DateTime.now();
+    final picked = await showDatePicker(
+      context: context,
+      initialDate: initial,
+      firstDate: DateTime(1970),
+      lastDate: DateTime.now().add(const Duration(days: 365)),
+    );
+    if (picked != null) {
+      setState(() {
+        if (start) {
+          _startDate = picked;
+          if (_endDate != null && _endDate!.isBefore(picked)) {
+            _endDate = picked;
+          }
+        } else {
+          _endDate = picked;
+        }
+      });
+      await _refreshLegs();
+    }
+  }
+
+  void _clearFilters() {
+    setState(() {
+      _startDate = null;
+      _endDate = null;
+      _sortDirection = 0;
+    });
+    _refreshLegs();
+  }
+
+  @override
+  Widget build(BuildContext context) {
     final data = context.watch<DataService>();
-    return ListView.builder(
+    final legs = data.legs;
-      itemCount: data.legs.length,
+    final pageMileage = _pageMileage(legs);
-      itemBuilder: (context, index) {
+
-        final leg = data.legs[index];
+    return RefreshIndicator(
-        return Card(
+      onRefresh: _refreshLegs,
-          margin: EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+      child: ListView(
-          child: Padding(
+        padding: const EdgeInsets.all(16),
-            padding: EdgeInsets.all(16),
+        physics: const AlwaysScrollableScrollPhysics(),
-            child: Column(
+        children: [
+          Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
-                Text('${leg.start} → ${leg.end}', style: TextStyle(fontSize: 16)),
+                  Text('Logbook',
-                Text('Mileage: ${leg.mileage.toStringAsFixed(2)} km'),
+                      style: Theme.of(context).textTheme.labelMedium),
-                Text('Headcode: ${leg.headcode}'),
+                  const SizedBox(height: 2),
-                Text('Begin: ${leg.beginTime}'),
+                  Text('Entries',
+                      style: Theme.of(context).textTheme.headlineSmall),
+                ],
+              ),
+              Card(
+                child: Padding(
+                  padding:
+                      const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.end,
+                    children: [
+                      Text('Page mileage',
+                          style: Theme.of(context).textTheme.labelSmall),
+                      Text('${pageMileage.toStringAsFixed(1)} mi',
+                          style: Theme.of(context)
+                              .textTheme
+                              .titleMedium
+                              ?.copyWith(fontWeight: FontWeight.w700)),
                     ],
                   ),
                 ),
-        );
+              ),
-      },
+            ],
+          ),
+          const SizedBox(height: 12),
+          Card(
+            child: Padding(
+              padding: const EdgeInsets.all(12),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.stretch,
+                children: [
+                  Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
+                      Text('Filters',
+                          style: Theme.of(context).textTheme.titleMedium),
+                      TextButton.icon(
+                        onPressed: _clearFilters,
+                        icon: const Icon(Icons.refresh),
+                        label: const Text('Clear'),
+                      ),
+                    ],
+                  ),
+                  const SizedBox(height: 8),
+                  Wrap(
+                    spacing: 12,
+                    runSpacing: 12,
+                    crossAxisAlignment: WrapCrossAlignment.center,
+                    children: [
+                      FilledButton.tonalIcon(
+                        onPressed: () => _pickDate(start: true),
+                        icon: const Icon(Icons.calendar_month),
+                        label: Text(
+                          _startDate == null
+                              ? 'Start date'
+                              : _formatDate(_startDate!)!,
+                        ),
+                      ),
+                      FilledButton.tonalIcon(
+                        onPressed: () => _pickDate(start: false),
+                        icon: const Icon(Icons.event),
+                        label: Text(
+                          _endDate == null
+                              ? 'End date'
+                              : _formatDate(_endDate!)!,
+                        ),
+                      ),
+                    ],
+                  ),
+                ],
+              ),
+            ),
+          ),
+          const SizedBox(height: 12),
+          if (data.isLegsLoading && legs.isEmpty)
+            const Center(
+              child: Padding(
+                padding: EdgeInsets.symmetric(vertical: 24.0),
+                child: CircularProgressIndicator(),
+              ),
+            )
+          else if (legs.isEmpty)
+            Card(
+              child: Padding(
+                padding: const EdgeInsets.all(16.0),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Text(
+                      'No entries found',
+                      style: Theme.of(context)
+                          .textTheme
+                          .titleMedium
+                          ?.copyWith(fontWeight: FontWeight.w700),
+                    ),
+                    const SizedBox(height: 8),
+                    const Text('Adjust the filters or add a new leg.'),
+                  ],
+                ),
+              ),
+            )
+          else
+            Column(
+              children: [
+                ...legs.map((leg) => _buildLegCard(context, leg)),
+                const SizedBox(height: 8),
+                if (data.legsHasMore || data.isLegsLoading)
+                  Align(
+                    alignment: Alignment.center,
+                    child: OutlinedButton.icon(
+                      onPressed:
+                          data.isLegsLoading ? null : () => _loadMore(),
+                      icon: data.isLegsLoading
+                          ? const SizedBox(
+                              height: 14,
+                              width: 14,
+                              child: CircularProgressIndicator(strokeWidth: 2),
+                            )
+                          : const Icon(Icons.expand_more),
+                      label: Text(
+                        data.isLegsLoading ? 'Loading...' : 'Load more',
+                      ),
+                    ),
+                  ),
+              ],
+            ),
+        ],
+      ),
     );
   }
+
+  String? _formatDate(DateTime? date) {
+    if (date == null) return null;
+    return '${date.year.toString().padLeft(4, '0')}-${date.month.toString().padLeft(2, '0')}-${date.day.toString().padLeft(2, '0')}';
+  }
+
+  String _formatDateTime(DateTime date) {
+    final dateStr = _formatDate(date) ?? '';
+    final timeStr =
+        '${date.hour.toString().padLeft(2, '0')}:${date.minute.toString().padLeft(2, '0')}';
+    return '$dateStr · $timeStr';
+  }
+
+  Widget _buildLegCard(BuildContext context, Leg leg) {
+    final routeSegments = _parseRouteSegments(leg.route);
+    final textTheme = Theme.of(context).textTheme;
+    return Card(
+      child: ExpansionTile(
+        tilePadding: const EdgeInsets.symmetric(horizontal: 12, vertical: 4),
+        leading: const Icon(Icons.train),
+        title: Text('${leg.start} → ${leg.end}'),
+        subtitle: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text(_formatDateTime(leg.beginTime)),
+            if (leg.headcode.isNotEmpty)
+              Text(
+                'Headcode: ${leg.headcode}',
+                style: textTheme.labelSmall,
+              ),
+            if (leg.network.isNotEmpty)
+              Text(
+                leg.network,
+                style: textTheme.labelSmall,
+              ),
+          ],
+        ),
+        trailing: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            Text(
+              '${leg.mileage.toStringAsFixed(1)} mi',
+              style:
+                  textTheme.labelLarge?.copyWith(fontWeight: FontWeight.w700),
+            ),
+            if (leg.tripId != 0)
+              Text(
+                'Trip #${leg.tripId}',
+                style: textTheme.labelSmall,
+              ),
+          ],
+        ),
+        children: [
+          Padding(
+            padding: const EdgeInsets.fromLTRB(16, 0, 16, 12),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                if (leg.notes.isNotEmpty) ...[
+                  Text('Notes', style: textTheme.titleSmall),
+                  const SizedBox(height: 4),
+                  Text(leg.notes),
+                  const SizedBox(height: 12),
+                ],
+                if (leg.locos.isNotEmpty) ...[
+                  Text('Locos', style: textTheme.titleSmall),
+                  const SizedBox(height: 6),
+                  Wrap(
+                    spacing: 8,
+                    runSpacing: 8,
+                    children: _buildLocoChips(context, leg),
+                  ),
+                  const SizedBox(height: 12),
+                ],
+                if (routeSegments.isNotEmpty) ...[
+                  Text('Route', style: textTheme.titleSmall),
+                  const SizedBox(height: 6),
+                  _buildRouteList(routeSegments),
+                ],
+              ],
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  List<Widget> _buildLocoChips(BuildContext context, Leg leg) {
+    final theme = Theme.of(context);
+    return leg.locos
+        .map(
+          (loco) => Chip(
+            label: Text('${loco.locoClass} ${loco.number}'),
+            avatar: const Icon(Icons.directions_railway, size: 16),
+            backgroundColor: theme.colorScheme.surfaceContainerHighest,
+          ),
+        )
+        .toList();
+  }
+
+  Widget _buildRouteList(List<String> segments) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: segments
+          .map(
+            (segment) => Padding(
+              padding: const EdgeInsets.symmetric(vertical: 4.0),
+              child: Row(
+                children: [
+                  const Icon(Icons.circle, size: 10),
+                  const SizedBox(width: 8),
+                  Expanded(child: Text(segment)),
+                ],
+              ),
+            ),
+          )
+          .toList(),
+    );
+  }
+
+  List<String> _parseRouteSegments(String route) {
+    final trimmed = route.trim();
+    if (trimmed.isEmpty) return [];
+    try {
+      final decoded = jsonDecode(trimmed);
+      if (decoded is List) {
+        return decoded.map((e) => e.toString()).toList();
+      }
+    } catch (_) {
+      // ignore and try alternative parsing
+    }
+    if (trimmed.startsWith('[') && trimmed.endsWith(']')) {
+      try {
+        final replaced = trimmed.replaceAll("'", '"');
+        final decoded = jsonDecode(replaced);
+        if (decoded is List) {
+          return decoded.map((e) => e.toString()).toList();
+        }
+      } catch (_) {}
+    }
+    if (trimmed.contains('->')) {
+      return trimmed
+          .split('->')
+          .map((e) => e.trim())
+          .where((e) => e.isNotEmpty)
+          .toList();
+    }
+    if (trimmed.contains(',')) {
+      return trimmed
+          .split(',')
+          .map((e) => e.trim())
+          .where((e) => e.isNotEmpty)
+          .toList();
+    }
+    return [trimmed];
+  }
 }

lib/components/pages/newEntry.dart

@@ -1,10 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-import 'package:mileograph_flutter/services/dataService.dart';
-
-class NewEntryPage extends StatelessWidget {
-  Widget build(BuildContext context) {
-    final data = context.watch<DataService>();
-    return Center(child: Text("New Entry Page"));
-  }
-}

lib/components/pages/new_entry.dart

@@ -0,0 +1,857 @@
+import 'dart:async';
+import 'dart:convert';
+
+import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
+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/apiService.dart';
+import 'package:mileograph_flutter/services/dataService.dart';
+import 'package:provider/provider.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+class NewEntryPage extends StatefulWidget {
+  const NewEntryPage({super.key});
+
+  @override
+  State<NewEntryPage> createState() => _NewEntryPageState();
+}
+
+class _NewEntryPageState extends State<NewEntryPage> {
+  static const _draftPrefsKey = 'new_entry_draft';
+
+  final _formKey = GlobalKey<FormState>();
+  DateTime _selectedDate = DateTime.now();
+  TimeOfDay _selectedTime = TimeOfDay.now();
+  final _startController = TextEditingController();
+  final _endController = TextEditingController();
+  final _headcodeController = TextEditingController();
+  final _notesController = TextEditingController();
+  final _mileageController = TextEditingController();
+  final _networkController = TextEditingController();
+  bool _submitting = false;
+  bool _useManualMileage = false;
+  RouteResult? _routeResult;
+  final List<_TractionItem> _tractionItems = [_TractionItem.marker()];
+  int? _selectedTripId;
+  bool _restoringDraft = false;
+
+  @override
+  void initState() {
+    super.initState();
+    for (final controller in [
+      _startController,
+      _endController,
+      _headcodeController,
+      _notesController,
+      _mileageController,
+      _networkController,
+    ]) {
+      controller.addListener(_saveDraft);
+    }
+    Future.microtask(() {
+      if (!mounted) return;
+      final data = context.read<DataService>();
+      data.fetchClassList();
+      data.fetchTrips();
+      _loadDraft();
+    });
+  }
+
+  @override
+  void dispose() {
+    for (final controller in [
+      _startController,
+      _endController,
+      _headcodeController,
+      _notesController,
+      _mileageController,
+      _networkController,
+    ]) {
+      controller.removeListener(_saveDraft);
+    }
+    _startController.dispose();
+    _endController.dispose();
+    _headcodeController.dispose();
+    _notesController.dispose();
+    _mileageController.dispose();
+    _networkController.dispose();
+    super.dispose();
+  }
+
+  Widget _buildTripSelector(BuildContext context) {
+    final trips = context.watch<DataService>().tripList;
+    final sorted = [...trips]..sort((a, b) => b.tripId.compareTo(a.tripId));
+    final tripIds = sorted.map((t) => t.tripId).toSet();
+    final selectedValue =
+        (_selectedTripId != null && tripIds.contains(_selectedTripId))
+            ? _selectedTripId
+            : null;
+    return Row(
+      children: [
+        Expanded(
+          child: DropdownButtonFormField<int?>(
+            value: selectedValue,
+            decoration: const InputDecoration(
+              labelText: 'Trip',
+              border: OutlineInputBorder(),
+            ),
+            items: [
+              const DropdownMenuItem(value: null, child: Text('No trip')),
+              ...sorted.map(
+                (t) =>
+                    DropdownMenuItem<int?>(value: t.tripId, child: Text(t.tripName)),
+              ),
+            ],
+            onChanged: (val) {
+              setState(() => _selectedTripId = val);
+              _saveDraft();
+            },
+          ),
+        ),
+        const SizedBox(width: 8),
+        ElevatedButton.icon(
+          onPressed: () => _showAddTripDialog(context),
+          icon: const Icon(Icons.add),
+          label: const Text('New Trip'),
+        ),
+      ],
+    );
+  }
+
+  Future<void> _showAddTripDialog(BuildContext context) async {
+    final controller = TextEditingController();
+    final result = await showDialog<String>(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: const Text('New Trip'),
+        content: TextField(
+          controller: controller,
+          decoration: const InputDecoration(labelText: 'Trip name'),
+          autofocus: true,
+        ),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.of(context).pop(),
+            child: const Text('Cancel'),
+          ),
+          ElevatedButton(
+            onPressed: () => Navigator.of(context).pop(controller.text.trim()),
+            child: const Text('Add'),
+          ),
+        ],
+      ),
+    );
+    if (!mounted) return;
+    if (result != null && result.isNotEmpty) {
+      final api = context.read<ApiService>();
+      final data = context.read<DataService>();
+      final messenger = ScaffoldMessenger.of(context);
+      try {
+        await api.put('/trips/new', {"trip_name": result});
+        await data.fetchTrips();
+        if (!mounted) return;
+        final trips = data.tripList;
+        final match = trips.firstWhere(
+          (t) => t.tripName == result,
+          orElse: () => trips.isNotEmpty
+              ? trips.first
+              : TripSummary(tripId: 0, tripName: result, tripMileage: 0),
+        );
+        setState(() => _selectedTripId = match.tripId);
+        _saveDraft();
+      } catch (e) {
+        if (!mounted) return;
+        messenger.showSnackBar(
+          SnackBar(content: Text('Failed to add trip: $e')),
+        );
+      }
+    }
+  }
+
+  Future<void> _openCalculator() async {
+    final result = await Navigator.of(context).push<RouteResult>(
+      MaterialPageRoute(
+        builder: (_) => _CalculatorPickerPage(
+          onResult: (res) => Navigator.of(context).pop(res),
+        ),
+      ),
+    );
+    if (result != null) {
+      setState(() {
+        _routeResult = result;
+        _mileageController.text = result.distance.toStringAsFixed(2);
+        _useManualMileage = false;
+      });
+      _saveDraft();
+    }
+  }
+
+  Future<void> _openTractionPicker() async {
+    final selectedKeys = _tractionItems
+        .where((e) => !e.isMarker && e.loco != null)
+        .map((e) => '${e.loco!.locoClass}-${e.loco!.number}')
+        .toSet();
+    await Navigator.of(context).push(
+      MaterialPageRoute(
+        builder: (_) => TractionPage(
+          selectionMode: true,
+          selectedKeys: selectedKeys,
+          onSelect: (loco) {
+            final markerIndex = _tractionItems.indexWhere(
+              (element) => element.isMarker,
+            );
+            final key = '${loco.locoClass}-${loco.number}';
+            setState(() {
+              final existingIndex = _tractionItems.indexWhere(
+                (e) =>
+                    !e.isMarker &&
+                    e.loco != null &&
+                    '${e.loco!.locoClass}-${e.loco!.number}' == key,
+              );
+              if (existingIndex != -1) {
+                _tractionItems.removeAt(existingIndex);
+              } else {
+                _tractionItems.insert(
+                  markerIndex,
+                  _TractionItem(loco: loco, powering: true),
+                );
+              }
+            });
+            _saveDraft();
+          },
+        ),
+      ),
+    );
+  }
+
+  Future<void> _pickDate() async {
+    final picked = await showDatePicker(
+      context: context,
+      initialDate: _selectedDate,
+      firstDate: DateTime(1970),
+      lastDate: DateTime.now().add(const Duration(days: 365)),
+    );
+    if (picked != null) setState(() => _selectedDate = picked);
+    _saveDraft();
+  }
+
+  Future<void> _pickTime() async {
+    final picked = await showTimePicker(
+      context: context,
+      initialTime: _selectedTime,
+    );
+    if (picked != null) {
+      setState(() => _selectedTime = picked);
+      _saveDraft();
+    }
+  }
+
+  DateTime get _legDateTime => DateTime(
+    _selectedDate.year,
+    _selectedDate.month,
+    _selectedDate.day,
+    _selectedTime.hour,
+    _selectedTime.minute,
+  );
+
+  List<Map<String, dynamic>> _buildTractionPayload() {
+    final markerIndex = _tractionItems.indexWhere(
+      (element) => element.isMarker,
+    );
+    final payload = <Map<String, dynamic>>[];
+    for (var i = 0; i < _tractionItems.length; i++) {
+      final item = _tractionItems[i];
+      if (item.isMarker || item.loco == null) continue;
+      int allocPos;
+      if (i > markerIndex) {
+        allocPos = -(i - markerIndex);
+      } else {
+        allocPos = (markerIndex - 1) - i;
+      }
+      payload.add({
+        "loco_type": item.loco!.type,
+        "loco_number": item.loco!.number,
+        "alloc_pos": allocPos,
+        "alloc_powering": item.powering ? 1 : 0,
+      });
+    }
+    return payload;
+  }
+
+  Future<void> _submit() async {
+    if (!_formKey.currentState!.validate()) return;
+    if (!_useManualMileage && _routeResult == null) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        const SnackBar(content: Text('Please calculate mileage first')),
+      );
+      return;
+    }
+    setState(() => _submitting = true);
+    final api = context.read<ApiService>();
+    final routeStations = _routeResult?.calculatedRoute ?? [];
+    final startVal = _useManualMileage
+        ? _startController.text.trim()
+        : (routeStations.isNotEmpty ? routeStations.first : '');
+    final endVal = _useManualMileage
+        ? _endController.text.trim()
+        : (routeStations.isNotEmpty ? routeStations.last : '');
+    final mileageVal = _useManualMileage
+        ? double.tryParse(_mileageController.text.trim()) ?? 0
+        : (_routeResult?.distance ?? 0);
+    final tractionPayload = _buildTractionPayload();
+
+    if (_useManualMileage) {
+      final body = {
+        "leg_trip": _selectedTripId ?? null,
+        "leg_start": startVal,
+        "leg_end": endVal,
+        "leg_begin_time": _legDateTime.toIso8601String(),
+        "leg_network": _networkController.text.trim(),
+        "leg_distance": mileageVal,
+        "isKilometers": false,
+        "leg_notes": _notesController.text.trim(),
+        "leg_headcode": _headcodeController.text.trim(),
+        "locos": tractionPayload,
+      };
+      await api.post('/add/manual', body);
+    } else {
+      final body = {
+        "leg_trip": _selectedTripId ?? null,
+        "leg_begin_time": _legDateTime.toIso8601String(),
+        "leg_route": routeStations,
+        "leg_notes": _notesController.text.trim(),
+        "leg_headcode": _headcodeController.text.trim(),
+        "leg_network": _networkController.text.trim(),
+        "locos": tractionPayload,
+      };
+      await api.post('/add', body);
+    }
+    if (mounted) {
+      context.read<DataService>().refreshLegs();
+    }
+    try {
+      if (!mounted) return;
+      ScaffoldMessenger.of(
+        context,
+      ).showSnackBar(const SnackBar(content: Text('Entry submitted')));
+      _resetFormState(clearDraft: true);
+    } catch (e) {
+      if (!mounted) return;
+      ScaffoldMessenger.of(
+        context,
+      ).showSnackBar(SnackBar(content: Text('Failed to submit: $e')));
+    } finally {
+      if (mounted) setState(() => _submitting = false);
+    }
+  }
+
+  Future<void> _resetFormState({bool clearDraft = false}) async {
+    _formKey.currentState?.reset();
+    _startController.clear();
+    _endController.clear();
+    _headcodeController.clear();
+    _notesController.clear();
+    _mileageController.clear();
+    _networkController.clear();
+    final now = DateTime.now();
+    setState(() {
+      _selectedDate = now;
+      _selectedTime = TimeOfDay.fromDateTime(now);
+      _useManualMileage = false;
+      _routeResult = null;
+      _tractionItems
+        ..clear()
+        ..add(_TractionItem.marker());
+      _selectedTripId = null;
+      _submitting = false;
+    });
+    if (clearDraft) {
+      await _clearDraft();
+    } else {
+      _saveDraft();
+    }
+  }
+
+  Future<void> _saveDraft() async {
+    if (_restoringDraft) return;
+    final prefs = await SharedPreferences.getInstance();
+    final draft = {
+      "date": _selectedDate.toIso8601String(),
+      "time": {"hour": _selectedTime.hour, "minute": _selectedTime.minute},
+      "start": _startController.text,
+      "end": _endController.text,
+      "headcode": _headcodeController.text,
+      "notes": _notesController.text,
+      "mileage": _mileageController.text,
+      "network": _networkController.text,
+      "useManualMileage": _useManualMileage,
+      "selectedTripId": _selectedTripId,
+      "routeResult": _routeResult == null
+          ? null
+          : {
+              "input_route": _routeResult!.inputRoute,
+              "calculated_route": _routeResult!.calculatedRoute,
+              "costs": _routeResult!.costs,
+              "distance": _routeResult!.distance,
+            },
+      "tractionItems": _serializeTractionItems(),
+    };
+    await prefs.setString(_draftPrefsKey, jsonEncode(draft));
+  }
+
+  Future<void> _clearDraft() async {
+    final prefs = await SharedPreferences.getInstance();
+    await prefs.remove(_draftPrefsKey);
+  }
+
+  Future<void> _loadDraft() async {
+    final prefs = await SharedPreferences.getInstance();
+    final raw = prefs.getString(_draftPrefsKey);
+    if (raw == null) return;
+    try {
+      final data = jsonDecode(raw);
+      if (data is! Map) return;
+      _restoringDraft = true;
+      setState(() {
+        if (data['date'] is String) {
+          _selectedDate = DateTime.tryParse(data['date']) ?? _selectedDate;
+        }
+        if (data['time'] is Map) {
+          final time = data['time'] as Map;
+          final hour = time['hour'] as int?;
+          final minute = time['minute'] as int?;
+          if (hour != null && minute != null) {
+            _selectedTime = TimeOfDay(hour: hour, minute: minute);
+          }
+        }
+        _useManualMileage = data['useManualMileage'] ?? _useManualMileage;
+        _selectedTripId = data['selectedTripId'];
+        if (data['routeResult'] is Map<String, dynamic>) {
+          _routeResult =
+              RouteResult.fromJson(Map<String, dynamic>.from(data['routeResult']));
+          _mileageController.text = _routeResult!.distance.toStringAsFixed(2);
+        }
+        if (data['tractionItems'] is List) {
+          _restoreTractionItems(List<Map<String, dynamic>>.from(
+            data['tractionItems'].cast<Map>(),
+          ));
+        }
+      });
+      _startController.text = data['start'] ?? '';
+      _endController.text = data['end'] ?? '';
+      _headcodeController.text = data['headcode'] ?? '';
+      _notesController.text = data['notes'] ?? '';
+      _mileageController.text = data['mileage'] ?? '';
+      _networkController.text = data['network'] ?? '';
+    } catch (_) {
+      // Ignore corrupt draft data
+    } finally {
+      _restoringDraft = false;
+    }
+  }
+
+  List<Map<String, dynamic>> _serializeTractionItems() {
+    return _tractionItems
+        .map(
+          (item) => {
+            "isMarker": item.isMarker,
+            "powering": item.powering,
+            "loco": item.loco == null
+                ? null
+                : {
+                    "id": item.loco!.id,
+                    "type": item.loco!.type,
+                    "number": item.loco!.number,
+                    "class": item.loco!.locoClass,
+                    "name": item.loco!.name,
+                    "operator": item.loco!.operator,
+                    "notes": item.loco!.notes,
+                    "evn": item.loco!.evn,
+                  },
+          },
+        )
+        .toList();
+  }
+
+  void _restoreTractionItems(List<Map<String, dynamic>> items) {
+    final restored = <_TractionItem>[];
+    for (final item in items) {
+      final locoData = item['loco'] as Map<String, dynamic>?;
+      LocoSummary? loco;
+      if (locoData != null) {
+        loco = LocoSummary(
+          locoId: locoData['id'] ?? 0,
+          locoType: locoData['type'] ?? '',
+          locoNumber: locoData['number'] ?? '',
+          locoName: locoData['name'] ?? '',
+          locoClass: locoData['class'] ?? '',
+          locoOperator: locoData['operator'] ?? '',
+          locoNotes: locoData['notes'],
+          locoEvn: locoData['evn'],
+        );
+      }
+      restored.add(
+        _TractionItem(
+          loco: loco,
+          powering: item['powering'] ?? true,
+          isMarker: item['isMarker'] ?? false,
+        ),
+      );
+    }
+    if (restored.where((e) => e.isMarker).isEmpty) {
+      restored.insert(0, _TractionItem.marker());
+    }
+    _tractionItems
+      ..clear()
+      ..addAll(restored);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final isMobile = MediaQuery.of(context).size.width < 700;
+    return Scaffold(
+      appBar: null,
+      body: Form(
+        key: _formKey,
+        child: LayoutBuilder(
+          builder: (context, constraints) {
+            final twoCol = !isMobile && constraints.maxWidth > 1000;
+
+            final detailPanel = _section('Details', [
+              _buildTripSelector(context),
+              Row(
+                children: [
+                  Expanded(
+                    child: OutlinedButton.icon(
+                      onPressed: _pickDate,
+                      icon: const Icon(Icons.calendar_today),
+                      label: Text(DateFormat.yMMMd().format(_selectedDate)),
+                    ),
+                  ),
+                  const SizedBox(width: 12),
+                  Expanded(
+                    child: OutlinedButton.icon(
+                      onPressed: _pickTime,
+                      icon: const Icon(Icons.schedule),
+                      label: Text(_selectedTime.format(context)),
+                    ),
+                  ),
+                ],
+              ),
+              if (_useManualMileage)
+                Row(
+                  children: [
+                    Expanded(
+                      child: TextFormField(
+                        controller: _startController,
+                        decoration: const InputDecoration(
+                          labelText: 'From',
+                          border: OutlineInputBorder(),
+                        ),
+                        validator: (v) => !_useManualMileage
+                            ? null
+                            : (v == null || v.isEmpty ? 'Required' : null),
+                      ),
+                    ),
+                    const SizedBox(width: 12),
+                    Expanded(
+                      child: TextFormField(
+                        controller: _endController,
+                        decoration: const InputDecoration(
+                          labelText: 'To',
+                          border: OutlineInputBorder(),
+                        ),
+                        validator: (v) => !_useManualMileage
+                            ? null
+                            : (v == null || v.isEmpty ? 'Required' : null),
+                      ),
+                    ),
+                  ],
+                ),
+              TextFormField(
+                controller: _headcodeController,
+                decoration: const InputDecoration(
+                  labelText: 'Headcode',
+                  border: OutlineInputBorder(),
+                ),
+              ),
+              TextFormField(
+                controller: _networkController,
+                decoration: const InputDecoration(
+                  labelText: 'Network',
+                  border: OutlineInputBorder(),
+                ),
+              ),
+              TextFormField(
+                controller: _notesController,
+                maxLines: 3,
+                decoration: const InputDecoration(
+                  labelText: 'Notes',
+                  border: OutlineInputBorder(),
+                ),
+              ),
+            ]);
+
+            final tractionPanel = _section('Traction', [
+              Align(
+                alignment: Alignment.centerLeft,
+                child: ElevatedButton.icon(
+                  onPressed: _openTractionPicker,
+                  icon: const Icon(Icons.search),
+                  label: const Text('Search traction'),
+                ),
+              ),
+              _buildTractionList(),
+            ]);
+
+            final mileagePanel = _section(
+              'Mileage',
+              [
+              if (_useManualMileage)
+                TextFormField(
+                  controller: _mileageController,
+                  keyboardType: const TextInputType.numberWithOptions(
+                    decimal: true,
+                  ),
+                  decoration: const InputDecoration(
+                    labelText: 'Mileage (mi)',
+                    border: OutlineInputBorder(),
+                  ),
+                )
+              else if (_routeResult != null)
+                ListTile(
+                  contentPadding: EdgeInsets.zero,
+                  title: const Text('Calculated mileage'),
+                  subtitle: Text(
+                    '${_routeResult!.distance.toStringAsFixed(2)} mi',
+                  ),
+                ),
+              if (!_useManualMileage)
+                Align(
+                  alignment: Alignment.centerLeft,
+                  child: ElevatedButton.icon(
+                  onPressed: _openCalculator,
+                  icon: const Icon(Icons.calculate),
+                  label: const Text('Open mileage calculator'),
+                ),
+                ),
+              ],
+              trailing: FilterChip(
+                label: Text(_useManualMileage ? 'Manual' : 'Automatic'),
+                selected: _useManualMileage,
+                onSelected: (val) {
+                  setState(() => _useManualMileage = val);
+                  _saveDraft();
+                },
+              ),
+            );
+
+            return SingleChildScrollView(
+              padding: const EdgeInsets.all(16),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.stretch,
+                children: [
+                  detailPanel,
+                  const SizedBox(height: 16),
+                  twoCol
+                      ? Row(
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: [
+                            Expanded(child: tractionPanel),
+                            const SizedBox(width: 16),
+                            Expanded(child: mileagePanel),
+                          ],
+                        )
+                      : Column(
+                          children: [
+                            tractionPanel,
+                            const SizedBox(height: 16),
+                            mileagePanel,
+                          ],
+                        ),
+                  const SizedBox(height: 12),
+                  OutlinedButton.icon(
+                    onPressed: _submitting
+                        ? null
+                        : () => _resetFormState(clearDraft: true),
+                    icon: const Icon(Icons.clear),
+                    label: const Text('Clear form'),
+                  ),
+                  const SizedBox(height: 8),
+                  ElevatedButton.icon(
+                    onPressed: _submitting ? null : _submit,
+                    icon: _submitting
+                        ? const SizedBox(
+                            height: 16,
+                            width: 16,
+                            child: CircularProgressIndicator(strokeWidth: 2),
+                          )
+                        : const Icon(Icons.send),
+                    label: Text(_submitting ? 'Submitting...' : 'Submit entry'),
+                  ),
+                ],
+              ),
+            );
+          },
+        ),
+      ),
+    );
+  }
+
+  Widget _buildTractionList() {
+    if (_tractionItems.length == 1) {
+      return const Padding(
+        padding: EdgeInsets.symmetric(vertical: 8.0),
+        child: Text('No traction selected yet.'),
+      );
+    }
+    return ReorderableListView.builder(
+      shrinkWrap: true,
+      physics: const NeverScrollableScrollPhysics(),
+      buildDefaultDragHandles: false,
+      onReorder: (oldIndex, newIndex) {
+        if (newIndex > oldIndex) newIndex -= 1;
+        setState(() {
+          final item = _tractionItems.removeAt(oldIndex);
+          _tractionItems.insert(newIndex, item);
+        });
+        _saveDraft();
+      },
+      itemCount: _tractionItems.length,
+      itemBuilder: (context, index) {
+        final item = _tractionItems[index];
+        if (item.isMarker) {
+          return Card(
+            key: const ValueKey('marker'),
+            color: Theme.of(context).colorScheme.surfaceContainerHighest,
+            child: const ListTile(
+              leading: Icon(Icons.train),
+              title: Text('Rolling stock marker'),
+              subtitle: Text(
+                'Place locomotives above/below. Positions set relative to this.',
+              ),
+            ),
+          );
+        }
+        final loco = item.loco!;
+        final markerIndex = _tractionItems.indexWhere(
+          (element) => element.isMarker,
+        );
+        final pos = index > markerIndex
+            ? -(index - markerIndex)
+            : (markerIndex - 1) - index;
+        return Card(
+          key: ValueKey('${loco.locoClass}-${loco.number}-$index'),
+          child: ListTile(
+            leading: ReorderableDragStartListener(
+              index: index,
+              child: const Icon(Icons.drag_indicator),
+            ),
+            title: Text('${loco.locoClass} ${loco.number}'),
+            subtitle: Text('${loco.name ?? ''} · Position $pos'),
+            trailing: Row(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                const Text('Powering'),
+                Switch(
+                  value: item.powering,
+                  onChanged: (v) {
+                    setState(() {
+                      _tractionItems[index] = item.copyWith(powering: v);
+                    });
+                    _saveDraft();
+                  },
+                ),
+                IconButton(
+                  icon: const Icon(Icons.delete),
+                  onPressed: () {
+                    setState(() {
+                      _tractionItems.removeAt(index);
+                    });
+                    _saveDraft();
+                  },
+                ),
+              ],
+            ),
+          ),
+        );
+      },
+    );
+  }
+
+  Widget _section(String title, List<Widget> children, {Widget? trailing}) {
+    return Card(
+      child: Padding(
+        padding: const EdgeInsets.all(12.0),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.stretch,
+          children: [
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                Text(
+                  title,
+                  style: Theme.of(
+                    context,
+                  ).textTheme.titleMedium?.copyWith(fontWeight: FontWeight.bold),
+                ),
+                if (trailing != null) trailing,
+              ],
+            ),
+            const SizedBox(height: 8),
+            ...children.map(
+              (w) => Padding(
+                padding: const EdgeInsets.symmetric(vertical: 6),
+                child: w,
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class _CalculatorPickerPage extends StatelessWidget {
+  const _CalculatorPickerPage({required this.onResult});
+  final ValueChanged<RouteResult> onResult;
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        leading: IconButton(
+          icon: const Icon(Icons.arrow_back),
+          onPressed: () => Navigator.of(context).pop(),
+        ),
+        title: const Text('Mileage calculator'),
+      ),
+      body: RouteCalculator(onApplyRoute: onResult),
+    );
+  }
+}
+
+class _TractionItem {
+  final LocoSummary? loco;
+  final bool powering;
+  final bool isMarker;
+
+  _TractionItem({
+    required this.loco,
+    this.powering = true,
+    this.isMarker = false,
+  });
+
+  factory _TractionItem.marker() =>
+      _TractionItem(loco: null, powering: false, isMarker: true);
+
+  _TractionItem copyWith({LocoSummary? loco, bool? powering, bool? isMarker}) {
+    return _TractionItem(
+      loco: loco ?? this.loco,
+      powering: powering ?? this.powering,
+      isMarker: isMarker ?? this.isMarker,
+    );
+  }
+}

lib/components/pages/traction.dart

@@ -1,41 +1,778 @@
 import 'package:flutter/material.dart';
 import 'package:mileograph_flutter/objects/objects.dart';
-import 'package:provider/provider.dart';
 import 'package:mileograph_flutter/services/dataService.dart';
+import 'package:provider/provider.dart';
 
-class TractionPage extends StatelessWidget {
+class TractionPage extends StatefulWidget {
+  const TractionPage({
+    super.key,
+    this.selectionMode = false,
+    this.onSelect,
+    this.selectedKeys = const {},
+  });
+
+  final bool selectionMode;
+  final ValueChanged<LocoSummary>? onSelect;
+  final Set<String> selectedKeys;
+
+  @override
+  State<TractionPage> createState() => _TractionPageState();
+}
+
+class _TractionPageState extends State<TractionPage> {
+  final _classController = TextEditingController();
+  final _classFocusNode = FocusNode();
+  final _numberController = TextEditingController();
+  final _nameController = TextEditingController();
+  bool _mileageFirst = true;
+  bool _initialised = false;
+  bool _showAdvancedFilters = false;
+  String? _selectedClass;
+  late Set<String> _selectedKeys;
+
+  final Map<String, TextEditingController> _dynamicControllers = {};
+  final Map<String, String?> _enumSelections = {};
+
+  @override
+  void initState() {
+    super.initState();
+    _classController.addListener(_onClassTextChanged);
+  }
+
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    if (!_initialised) {
+      _initialised = true;
+      _selectedKeys = {...widget.selectedKeys};
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        final data = context.read<DataService>();
+        data.fetchClassList();
+        data.fetchEventFields();
+        _refreshTraction();
+      });
+    }
+  }
+
+  @override
+  void dispose() {
+    _classController.removeListener(_onClassTextChanged);
+    _classController.dispose();
+    _classFocusNode.dispose();
+    _numberController.dispose();
+    _nameController.dispose();
+    for (final controller in _dynamicControllers.values) {
+      controller.dispose();
+    }
+    super.dispose();
+  }
+
+  bool get _hasFilters {
+    final dynamicFieldsUsed = _dynamicControllers.values
+            .any((controller) => controller.text.trim().isNotEmpty) ||
+        _enumSelections.values
+            .any((value) => (value ?? '').toString().trim().isNotEmpty);
+
+    return [
+      _selectedClass,
+      _classController.text,
+      _numberController.text,
+      _nameController.text,
+    ].any((value) => (value ?? '').toString().trim().isNotEmpty) ||
+        dynamicFieldsUsed;
+  }
+
+  Future<void> _refreshTraction({bool append = false}) async {
+    final data = context.read<DataService>();
+    final filters = <String, dynamic>{};
+    final name = _nameController.text.trim();
+    if (name.isNotEmpty) filters['name'] = name;
+    _dynamicControllers.forEach((key, controller) {
+      final value = controller.text.trim();
+      if (value.isNotEmpty) filters[key] = value;
+    });
+    _enumSelections.forEach((key, value) {
+      if (value != null && value.toString().trim().isNotEmpty) {
+        filters[key] = value;
+      }
+    });
+    final hadOnly = !_hasFilters;
+    await data.fetchTraction(
+      hadOnly: hadOnly,
+      locoClass: _selectedClass ?? _classController.text.trim(),
+      locoNumber: _numberController.text.trim(),
+      offset: append ? data.traction.length : 0,
+      append: append,
+      filters: filters,
+      mileageFirst: _mileageFirst,
+    );
+  }
+
+  void _clearFilters() {
+    for (final controller in [_classController, _numberController, _nameController]) {
+      controller.clear();
+    }
+    for (final controller in _dynamicControllers.values) {
+      controller.clear();
+    }
+    _enumSelections.clear();
+    setState(() {
+      _selectedClass = null;
+      _mileageFirst = true;
+    });
+    _refreshTraction();
+  }
+
+  void _onClassTextChanged() {
+    if (_selectedClass != null &&
+        _classController.text.trim() != (_selectedClass ?? '')) {
+      setState(() {
+        _selectedClass = null;
+      });
+    }
+  }
+
+  List<EventField> _activeEventFields(List<EventField> fields) {
+    return fields
+        .where(
+          (field) =>
+              !['class', 'number', 'name', 'build date', 'build_date']
+                  .contains(field.name.toLowerCase()),
+        )
+        .toList();
+  }
+
+  void _ensureControllersForFields(List<EventField> fields) {
+    for (final field in fields) {
+      if (field.enumValues != null) {
+        _enumSelections.putIfAbsent(field.name, () => null);
+      } else {
+        _dynamicControllers.putIfAbsent(field.name, () => TextEditingController());
+      }
+    }
+  }
+
+  @override
   Widget build(BuildContext context) {
     final data = context.watch<DataService>();
-    return ListView.builder(
+    final traction = data.traction;
-      itemCount: data.traction.length,
+    final classOptions = data.locoClasses;
-      itemBuilder: (context, index) {
+    final isMobile = MediaQuery.of(context).size.width < 700;
-        final loco = data.traction[index];
+    _ensureControllersForFields(data.eventFields);
-        return Card(
+    final extraFields = _activeEventFields(data.eventFields);
-          margin: EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+
-          child: Padding(
+    final listView = RefreshIndicator(
-            padding: EdgeInsets.all(16),
+      onRefresh: _refreshTraction,
-            child: Column(
+      child: ListView(
-              mainAxisAlignment: MainAxisAlignment.start,
+        padding: const EdgeInsets.all(16),
+        physics: const AlwaysScrollableScrollPhysics(),
         children: [
           Row(
-                  mainAxisAlignment: MainAxisAlignment.start,
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  children: [Text('${loco.locoClass} ${loco.number}')],
+            children: [
+              Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text('Fleet', style: Theme.of(context).textTheme.labelMedium),
+                  const SizedBox(height: 2),
+                  Text(
+                    'Traction',
+                    style: Theme.of(context).textTheme.headlineSmall,
                   ),
+                ],
+              ),
+              IconButton(
+                tooltip: 'Refresh',
+                onPressed: _refreshTraction,
+                icon: const Icon(Icons.refresh),
+              ),
+            ],
+          ),
+          const SizedBox(height: 12),
+          Card(
+            child: Padding(
+              padding: const EdgeInsets.all(12),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.stretch,
+                children: [
                   Row(
                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     children: [
                       Text(
-                      '${loco.name}',
+                        'Filters',
-                      style: TextStyle(fontStyle: FontStyle.italic),
+                        style: Theme.of(context).textTheme.titleMedium,
                       ),
-                    Text('${loco.mileage} mi'),
+                      TextButton(
-                  ],
+                        onPressed: _clearFilters,
+                        child: const Text('Clear'),
                       ),
                     ],
                   ),
+                  const SizedBox(height: 8),
+                  Wrap(
+                    spacing: 12,
+                    runSpacing: 12,
+                    children: [
+                      SizedBox(
+                        width: isMobile ? double.infinity : 240,
+                        child: RawAutocomplete<String>(
+                          textEditingController: _classController,
+                          focusNode: _classFocusNode,
+                          optionsBuilder: (TextEditingValue textEditingValue) {
+                            final query = textEditingValue.text.toLowerCase();
+                            if (query.isEmpty) {
+                              return classOptions;
+                            }
+                            return classOptions.where(
+                              (c) => c.toLowerCase().contains(query),
+                            );
+                          },
+                          fieldViewBuilder:
+                              (context, controller, focusNode, onFieldSubmitted) {
+                            return TextField(
+                              controller: controller,
+                              focusNode: focusNode,
+                              decoration: const InputDecoration(
+                                labelText: 'Class',
+                                border: OutlineInputBorder(),
+                              ),
+                              onSubmitted: (_) => _refreshTraction(),
+                            );
+                          },
+                          optionsViewBuilder: (context, onSelected, options) {
+                            final optionList = options.toList();
+                            if (optionList.isEmpty) {
+                              return const SizedBox.shrink();
+                            }
+                            final maxWidth = isMobile
+                                ? MediaQuery.of(context).size.width - 64
+                                : 240.0;
+                            return Align(
+                              alignment: Alignment.topLeft,
+                              child: Material(
+                                elevation: 4,
+                                child: ConstrainedBox(
+                                  constraints: BoxConstraints(
+                                    maxWidth: maxWidth,
+                                    maxHeight: 240,
+                                  ),
+                                  child: ListView.builder(
+                                    padding: EdgeInsets.zero,
+                                    shrinkWrap: true,
+                                    itemCount: optionList.length,
+                                    itemBuilder: (context, index) {
+                                      final option = optionList[index];
+                                      return ListTile(
+                                        title: Text(option),
+                                        onTap: () => onSelected(option),
+                                      );
+                                    },
+                                  ),
+                                ),
                               ),
                             );
                           },
+                          onSelected: (String selection) {
+                            setState(() {
+                              _selectedClass = selection;
+                              _classController.text = selection;
+                            });
+                            _refreshTraction();
+                          },
+                        ),
+                      ),
+                      SizedBox(
+                        width: isMobile ? double.infinity : 220,
+                        child: TextField(
+                          controller: _numberController,
+                          decoration: const InputDecoration(
+                            labelText: 'Number',
+                            border: OutlineInputBorder(),
+                          ),
+                          onSubmitted: (_) => _refreshTraction(),
+                        ),
+                      ),
+                      SizedBox(
+                        width: isMobile ? double.infinity : 220,
+                        child: TextField(
+                          controller: _nameController,
+                          decoration: const InputDecoration(
+                            labelText: 'Name',
+                            border: OutlineInputBorder(),
+                          ),
+                          onSubmitted: (_) => _refreshTraction(),
+                        ),
+                      ),
+                      FilterChip(
+                        label: Text(
+                          _mileageFirst ? 'Mileage first' : 'Number order',
+                        ),
+                        selected: _mileageFirst,
+                        onSelected: (v) {
+                          setState(() => _mileageFirst = v);
+                          _refreshTraction();
+                        },
+                      ),
+                      TextButton.icon(
+                        onPressed: () => setState(
+                          () => _showAdvancedFilters = !_showAdvancedFilters,
+                        ),
+                        icon: Icon(
+                          _showAdvancedFilters
+                              ? Icons.expand_less
+                              : Icons.expand_more,
+                        ),
+                        label: Text(
+                          _showAdvancedFilters ? 'Hide filters' : 'More filters',
+                        ),
+                      ),
+                      ElevatedButton.icon(
+                        onPressed: _refreshTraction,
+                        icon: const Icon(Icons.search),
+                        label: const Text('Search'),
+                      ),
+                    ],
+                  ),
+                  AnimatedCrossFade(
+                    crossFadeState: _showAdvancedFilters
+                        ? CrossFadeState.showFirst
+                        : CrossFadeState.showSecond,
+                    duration: const Duration(milliseconds: 200),
+                    firstChild: Padding(
+                      padding: const EdgeInsets.only(top: 12.0),
+                      child: data.isEventFieldsLoading
+                          ? const Center(
+                              child: Padding(
+                                padding: EdgeInsets.all(8.0),
+                                child: CircularProgressIndicator(strokeWidth: 2),
+                              ),
+                            )
+                          : extraFields.isEmpty
+                              ? const Text('No extra filters available right now.')
+                              : Wrap(
+                                  spacing: 12,
+                                  runSpacing: 12,
+                                  children: extraFields
+                                      .map(
+                                        (field) => _buildFilterInput(
+                                          context,
+                                          field,
+                                          isMobile,
+                                        ),
+                                      )
+                                      .toList(),
+                                ),
+                    ),
+                    secondChild: const SizedBox.shrink(),
+                  ),
+                ],
+              ),
+            ),
+          ),
+          const SizedBox(height: 12),
+          if (data.isTractionLoading && traction.isEmpty)
+            const Center(
+              child: Padding(
+                padding: EdgeInsets.symmetric(vertical: 24.0),
+                child: CircularProgressIndicator(),
+              ),
+            )
+          else if (traction.isEmpty)
+            Card(
+              child: Padding(
+                padding: const EdgeInsets.all(16.0),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Text(
+                      'No traction found',
+                      style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                        fontWeight: FontWeight.w700,
+                      ),
+                    ),
+                    const SizedBox(height: 8),
+                    const Text('Try relaxing the filters or sync again.'),
+                  ],
+                ),
+              ),
+            )
+          else
+            Column(
+              children: [
+                ...traction.map((loco) => _buildTractionCard(context, loco)),
+                if (data.tractionHasMore || data.isTractionLoading)
+                  Padding(
+                    padding: const EdgeInsets.only(top: 8.0),
+                    child: OutlinedButton.icon(
+                      onPressed:
+                          data.isTractionLoading ? null : () => _refreshTraction(append: true),
+                      icon: data.isTractionLoading
+                          ? const SizedBox(
+                              height: 14,
+                              width: 14,
+                              child: CircularProgressIndicator(strokeWidth: 2),
+                            )
+                          : const Icon(Icons.expand_more),
+                      label: Text(
+                        data.isTractionLoading ? 'Loading...' : 'Load more',
+                      ),
+                    ),
+                  ),
+              ],
+            ),
+        ],
+      ),
+    );
+
+    if (widget.selectionMode) {
+      return Scaffold(
+        appBar: AppBar(
+          leadingWidth: 140,
+          leading: Padding(
+            padding: const EdgeInsets.only(left: 8.0),
+            child: TextButton.icon(
+              onPressed: () => Navigator.of(context).pop(),
+              icon: const Icon(Icons.arrow_back),
+              label: const Text('Back'),
+              style: TextButton.styleFrom(
+                padding: const EdgeInsets.symmetric(
+                  horizontal: 12,
+                  vertical: 10,
+                ),
+                foregroundColor: Theme.of(context).colorScheme.onSurface,
+              ),
+            ),
+          ),
+          title: null,
+        ),
+        body: listView,
+      );
+    }
+
+    return listView;
+  }
+
+  Widget _buildTractionCard(BuildContext context, LocoSummary loco) {
+    final keyVal = '${loco.locoClass}-${loco.number}';
+    final isSelected = _selectedKeys.contains(keyVal);
+    final status = loco.status ?? 'Unknown';
+    final operatorName = loco.operator ?? '';
+    final domain = loco.domain ?? '';
+    final statusColors = _statusChipColors(context, status);
+    return Card(
+      child: Padding(
+        padding: const EdgeInsets.all(12.0),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Text(
+                      '${loco.locoClass} ${loco.number}',
+                      style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                        fontWeight: FontWeight.w700,
+                      ),
+                    ),
+                    if ((loco.name ?? '').isNotEmpty)
+                      Text(
+                        loco.name ?? '',
+                        style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                          fontStyle: FontStyle.italic,
+                        ),
+                      ),
+                  ],
+                ),
+                Chip(
+                  label: Text(status),
+                  backgroundColor: statusColors.$1,
+                  labelStyle: TextStyle(color: statusColors.$2),
+                ),
+              ],
+            ),
+            const SizedBox(height: 8),
+            Row(
+              children: [
+                TextButton.icon(
+                  onPressed: () => _showLocoInfo(loco),
+                  icon: const Icon(Icons.info_outline),
+                  label: const Text('Details'),
+                ),
+                const Spacer(),
+                if (widget.selectionMode)
+                  TextButton.icon(
+                    onPressed: () {
+                      if (widget.onSelect != null) {
+                        widget.onSelect!(loco);
+                      }
+                      setState(() {
+                        if (isSelected) {
+                          _selectedKeys.remove(keyVal);
+                        } else {
+                          _selectedKeys.add(keyVal);
+                        }
+                      });
+                    },
+                    icon: Icon(
+                      isSelected
+                          ? Icons.remove_circle_outline
+                          : Icons.add_circle_outline,
+                    ),
+                    label: Text(isSelected ? 'Remove' : 'Add to entry'),
+                  ),
+              ],
+            ),
+            Wrap(
+              spacing: 8,
+              runSpacing: 4,
+              children: [
+                _statPill(
+                  context,
+                  label: 'Miles',
+                  value: _formatNumber(loco.mileage),
+                ),
+                _statPill(
+                  context,
+                  label: 'Trips',
+                  value: (loco.trips ?? loco.journeys ?? 0).toString(),
+                ),
+                if (operatorName.isNotEmpty)
+                  _statPill(context, label: 'Operator', value: operatorName),
+                if (domain.isNotEmpty)
+                  _statPill(context, label: 'Domain', value: domain),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _statPill(
+    BuildContext context, {
+    required String label,
+    required String value,
+  }) {
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 6),
+      decoration: BoxDecoration(
+        color: Theme.of(context).colorScheme.surfaceContainerHighest,
+        borderRadius: BorderRadius.circular(10),
+      ),
+      child: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Text('$label: ', style: Theme.of(context).textTheme.labelSmall),
+          Text(
+            value,
+            style: Theme.of(
+              context,
+            ).textTheme.labelSmall?.copyWith(fontWeight: FontWeight.w700),
+          ),
+        ],
+      ),
+    );
+  }
+
+  (Color, Color) _statusChipColors(BuildContext context, String status) {
+    final scheme = Theme.of(context).colorScheme;
+    final isDark = scheme.brightness == Brightness.dark;
+    Color blend(Color base, {double bgOpacity = 0.18, double fgOpacity = 0.82}) {
+      final bg = Color.alphaBlend(
+        base.withOpacity(isDark ? bgOpacity + 0.07 : bgOpacity),
+        scheme.surface,
+      );
+      final fg = Color.alphaBlend(
+        base.withOpacity(isDark ? fgOpacity : fgOpacity * 0.8),
+        scheme.onSurface,
+      );
+      return Color.lerp(bg, fg, 0.0) ?? bg;
+    }
+
+    Color background;
+    Color foreground;
+    final key = status.toLowerCase();
+
+    if (key.contains('scrap')) {
+      background = blend(Colors.red);
+      foreground = Colors.red.shade200.withOpacity(isDark ? 0.85 : 0.9);
+    } else if (key.contains('active')) {
+      background = blend(scheme.primary);
+      foreground = scheme.primary.withOpacity(isDark ? 0.9 : 0.8);
+    } else if (key.contains('withdrawn')) {
+      background = blend(Colors.amber);
+      foreground = Colors.amber.shade800.withOpacity(isDark ? 0.9 : 0.8);
+    } else if (key.contains('stored') || key.contains('unknown')) {
+      background = blend(Colors.grey);
+      foreground = Colors.grey.shade700.withOpacity(isDark ? 0.85 : 0.75);
+    } else {
+      background = scheme.surfaceContainerHighest;
+      foreground = scheme.onSurface;
+    }
+    return (background, foreground);
+  }
+
+  Future<void> _showLocoInfo(LocoSummary loco) async {
+    await showModalBottomSheet(
+      context: context,
+      isScrollControlled: true,
+      builder: (ctx) {
+        return DraggableScrollableSheet(
+          expand: false,
+          maxChildSize: 0.9,
+          initialChildSize: 0.65,
+          builder: (_, controller) {
+            return Padding(
+              padding: const EdgeInsets.all(16.0),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Row(
+                    children: [
+                      IconButton(
+                        icon: const Icon(Icons.close),
+                        onPressed: () => Navigator.of(ctx).pop(),
+                      ),
+                      const SizedBox(width: 8),
+                      Text(
+                        '${loco.locoClass} ${loco.number}',
+                        style: Theme.of(context).textTheme.titleLarge?.copyWith(
+                          fontWeight: FontWeight.w700,
+                        ),
+                      ),
+                    ],
+                  ),
+                  if ((loco.name ?? '').isNotEmpty)
+                    Padding(
+                      padding: const EdgeInsets.only(left: 52.0, bottom: 12),
+                      child: Text(
+                        loco.name ?? '',
+                        style: Theme.of(context).textTheme.bodyMedium,
+                      ),
+                    ),
+                  const SizedBox(height: 4),
+                  Expanded(
+                    child: ListView(
+                      controller: controller,
+                      children: [
+                        _detailRow('Status', loco.status ?? 'Unknown'),
+                        _detailRow('Operator', loco.operator ?? ''),
+                        _detailRow('Domain', loco.domain ?? ''),
+                        _detailRow('Owner', loco.owner ?? ''),
+                        _detailRow('Livery', loco.livery ?? ''),
+                        _detailRow('Location', loco.location ?? ''),
+                        _detailRow('Mileage', _formatNumber(loco.mileage ?? 0)),
+                        _detailRow(
+                          'Trips',
+                          (loco.trips ?? loco.journeys ?? 0).toString(),
+                        ),
+                        _detailRow('EVN', loco.evn ?? ''),
+                        if (loco.notes != null && loco.notes!.isNotEmpty)
+                          _detailRow('Notes', loco.notes!),
+                      ],
+                    ),
+                  ),
+                ],
+              ),
+            );
+          },
+        );
+      },
+    );
+  }
+
+  Widget _detailRow(String label, String value) {
+    if (value.isEmpty) return const SizedBox.shrink();
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 6.0),
+      child: Row(
+        children: [
+          SizedBox(
+            width: 110,
+            child: Text(
+              label,
+              style: Theme.of(
+                context,
+              ).textTheme.labelMedium?.copyWith(fontWeight: FontWeight.w600),
+            ),
+          ),
+          Expanded(
+            child: Text(value, style: Theme.of(context).textTheme.bodyMedium),
+          ),
+        ],
+      ),
+    );
+  }
+
+  String _formatNumber(double? value) {
+    if (value == null) return '0';
+    return value.toStringAsFixed(1);
+  }
+
+  Widget _buildFilterInput(
+    BuildContext context,
+    EventField field,
+    bool isMobile,
+  ) {
+    final width = isMobile ? double.infinity : 220.0;
+    if (field.enumValues != null && field.enumValues!.isNotEmpty) {
+      final options = field.enumValues!.map((e) => e.toString()).toSet().toList();
+      final currentValue = _enumSelections[field.name];
+      final safeValue = options.contains(currentValue) ? currentValue : null;
+      return SizedBox(
+        width: width,
+        child: DropdownButtonFormField<String?>(
+          value: safeValue,
+          decoration: InputDecoration(
+            labelText: field.display,
+            border: const OutlineInputBorder(),
+          ),
+          items: [
+            const DropdownMenuItem(value: null, child: Text('Any')),
+            ...options
+                .map(
+                  (value) => DropdownMenuItem(
+                    value: value,
+                    child: Text(value),
+                  ),
+                )
+                .toList(),
+          ],
+          onChanged: (val) {
+            setState(() {
+              _enumSelections[field.name] = val;
+            });
+            _refreshTraction();
+          },
+        ),
+      );
+    }
+
+    final controller =
+        _dynamicControllers[field.name] ?? TextEditingController();
+    _dynamicControllers[field.name] = controller;
+    TextInputType? inputType;
+    if (field.type != null) {
+      final type = field.type!.toLowerCase();
+      if (type.contains('int') || type.contains('num') || type.contains('double')) {
+        inputType = const TextInputType.numberWithOptions(decimal: true);
+      }
+    }
+
+    return SizedBox(
+      width: width,
+      child: TextField(
+        controller: controller,
+        keyboardType: inputType,
+        decoration: InputDecoration(
+          labelText: field.display,
+          border: const OutlineInputBorder(),
+        ),
+        onSubmitted: (_) => _refreshTraction(),
+      ),
     );
   }
 }

lib/components/pages/trips.dart

@@ -1,28 +1,261 @@
 import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
+import 'package:mileograph_flutter/objects/objects.dart';
 import 'package:mileograph_flutter/services/dataService.dart';
+import 'package:provider/provider.dart';
 
-class TripsPage extends StatelessWidget {
+class TripsPage extends StatefulWidget {
+  const TripsPage({super.key});
+
+  @override
+  State<TripsPage> createState() => _TripsPageState();
+}
+
+class _TripsPageState extends State<TripsPage> {
+  bool _initialised = false;
+
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    if (!_initialised) {
+      _initialised = true;
+      _refreshTrips();
+    }
+  }
+
+  Future<void> _refreshTrips() async {
+    await context.read<DataService>().fetchTripDetails();
+  }
+
+  @override
   Widget build(BuildContext context) {
     final data = context.watch<DataService>();
-    return ListView.builder(
+    final tripDetails = data.tripDetails;
-      itemCount: data.legs.length,
+    final tripSummaries = data.trips;
-      itemBuilder: (context, index) {
+    final isMobile = MediaQuery.of(context).size.width < 700;
-        final leg = data.legs[index];
+    final showLoading = data.isTripDetailsLoading && tripDetails.isEmpty;
-        return Card(
+
-          margin: EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+    return RefreshIndicator(
+      onRefresh: _refreshTrips,
+      child: ListView(
+        padding: const EdgeInsets.all(16),
+        physics: const AlwaysScrollableScrollPhysics(),
+        children: [
+          Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(
+                    'Journeys',
+                    style: Theme.of(context).textTheme.labelMedium,
+                  ),
+                  const SizedBox(height: 2),
+                  Text(
+                    'Trips',
+                    style: Theme.of(context).textTheme.headlineSmall,
+                  ),
+                ],
+              ),
+              Row(
+                children: [
+                  IconButton(
+                    onPressed: _refreshTrips,
+                    icon: const Icon(Icons.refresh),
+                    tooltip: 'Refresh trips',
+                  ),
+                ],
+              ),
+            ],
+          ),
+          const SizedBox(height: 12),
+          if (showLoading)
+            const Center(
               child: Padding(
-            padding: EdgeInsets.all(16),
+                padding: EdgeInsets.symmetric(vertical: 24.0),
+                child: CircularProgressIndicator(),
+              ),
+            )
+          else if (tripDetails.isEmpty && tripSummaries.isEmpty)
+            Card(
+              child: Padding(
+                padding: const EdgeInsets.all(16.0),
                 child: Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
                     Text(
-                  '${leg.start} → ${leg.end}',
+                      'No trips yet',
-                  style: TextStyle(fontSize: 16),
+                      style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                        fontWeight: FontWeight.w700,
+                      ),
+                    ),
+                    const SizedBox(height: 8),
+                    const Text(
+                      'Use the Add entry flow to start grouping legs into trips.',
+                    ),
+                  ],
+                ),
+              ),
+            )
+          else if (tripDetails.isEmpty)
+            Column(
+              children: tripSummaries
+                  .map(
+                    (trip) => Card(
+                      child: ListTile(
+                        title: Text(trip.tripName),
+                        subtitle: Text(
+                          '${trip.tripMileage.toStringAsFixed(1)} mi',
+                        ),
+                      ),
+                    ),
+                  )
+                  .toList(),
+            )
+          else
+            Column(
+              children: tripDetails
+                  .map((trip) => _buildTripCard(context, trip, isMobile))
+                  .toList(),
+            ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildTripCard(BuildContext context, TripDetail trip, bool isMobile) {
+    final legs = trip.legs;
+    return Card(
+      child: Padding(
+        padding: const EdgeInsets.all(12.0),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Text(
+                      trip.name,
+                      style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                        fontWeight: FontWeight.w700,
+                      ),
+                    ),
+                    Text(
+                      '${trip.mileage.toStringAsFixed(1)} mi · ${trip.legCount} legs',
+                      style: Theme.of(context).textTheme.bodyMedium,
+                    ),
+                  ],
+                ),
+                Row(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    IconButton(
+                      icon: const Icon(Icons.train),
+                      tooltip: 'Traction',
+                      onPressed: () => _showTripWinners(context, trip),
+                    ),
+                    IconButton(
+                      icon: const Icon(Icons.open_in_new),
+                      tooltip: 'Details',
+                      onPressed: () => _showTripDetail(context, trip),
+                    ),
+                  ],
+                ),
+              ],
+            ),
+            const SizedBox(height: 8),
+            if (legs.isNotEmpty)
+              Column(
+                children: legs.take(isMobile ? 2 : 3).map((leg) {
+                  return ListTile(
+                    dense: isMobile,
+                    contentPadding: EdgeInsets.zero,
+                    leading: const Icon(Icons.train),
+                    title: Text('${leg.start} → ${leg.end}'),
+                    subtitle: Text(
+                      _formatDate(leg.beginTime),
+                      maxLines: 1,
+                      overflow: TextOverflow.ellipsis,
+                    ),
+                    trailing: Text(
+                      leg.mileage?.toStringAsFixed(1) ?? '-',
+                      style: Theme.of(context).textTheme.labelLarge?.copyWith(
+                        fontWeight: FontWeight.bold,
+                      ),
+                    ),
+                  );
+                }).toList(),
+              ),
+            if (legs.length > 3)
+              Padding(
+                padding: const EdgeInsets.only(top: 6.0),
+                child: Text(
+                  '+${legs.length - 3} more legs',
+                  style: Theme.of(context).textTheme.bodySmall,
+                ),
+              ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  String _formatDate(DateTime? date) {
+    if (date == null) return '';
+    return '${date.year.toString().padLeft(4, '0')}-${date.month.toString().padLeft(2, '0')}-${date.day.toString().padLeft(2, '0')}';
+  }
+
+  void _showTripDetail(BuildContext context, TripDetail trip) {
+    showModalBottomSheet(
+      context: context,
+      isScrollControlled: true,
+      builder: (_) {
+        return SafeArea(
+          child: Padding(
+            padding: const EdgeInsets.all(16.0),
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Row(
+                  children: [
+                    IconButton(
+                      icon: const Icon(Icons.arrow_back),
+                      onPressed: () => Navigator.of(context).pop(),
+                    ),
+                    Text(
+                      trip.name,
+                      style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                        fontWeight: FontWeight.bold,
+                      ),
+                    ),
+                    const Spacer(),
+                    Text('${trip.mileage.toStringAsFixed(1)} mi'),
+                  ],
+                ),
+                const SizedBox(height: 8),
+                SizedBox(
+                  height: MediaQuery.of(context).size.height * 0.6,
+                  child: ListView.builder(
+                    itemCount: trip.legs.length,
+                    itemBuilder: (context, index) {
+                      final leg = trip.legs[index];
+                      return ListTile(
+                        leading: const Icon(Icons.train),
+                        title: Text('${leg.start} → ${leg.end}'),
+                        subtitle: Text(_formatDate(leg.beginTime)),
+                        trailing: Text(
+                          leg.mileage?.toStringAsFixed(1) ?? '-',
+                          style: Theme.of(context).textTheme.labelLarge
+                              ?.copyWith(fontWeight: FontWeight.bold),
+                        ),
+                      );
+                    },
+                  ),
                 ),
-                Text('Mileage: ${leg.mileage.toStringAsFixed(2)} km'),
-                Text('Headcode: ${leg.headcode}'),
-                Text('Begin: ${leg.beginTime}'),
               ],
             ),
           ),
@@ -30,4 +263,94 @@ class TripsPage extends StatelessWidget {
       },
     );
   }
+
+  void _showTripWinners(BuildContext context, TripDetail trip) {
+    showModalBottomSheet(
+      context: context,
+      isScrollControlled: true,
+      builder: (_) {
+        final data = context.read<DataService>();
+        return SafeArea(
+          child: FutureBuilder<List<TripLocoStat>>(
+            future: data.fetchTripLocoStats(trip.id),
+            builder: (ctx, snapshot) {
+              final items = snapshot.data ?? [];
+              final loading =
+                  snapshot.connectionState == ConnectionState.waiting;
+              return Padding(
+                padding: const EdgeInsets.all(16.0),
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Row(
+                      children: [
+                        IconButton(
+                          icon: const Icon(Icons.arrow_back),
+                          onPressed: () => Navigator.of(context).pop(),
+                        ),
+                        Text(
+                          trip.name,
+                          style: Theme.of(context)
+                              .textTheme
+                              .titleMedium
+                              ?.copyWith(fontWeight: FontWeight.bold),
+                        ),
+                        const Spacer(),
+                        Text('${trip.mileage.toStringAsFixed(1)} mi'),
+                      ],
+                    ),
+                    const SizedBox(height: 8),
+                    if (loading)
+                      const Center(
+                        child: Padding(
+                          padding: EdgeInsets.symmetric(vertical: 24.0),
+                          child: CircularProgressIndicator(),
+                        ),
+                      )
+                    else if (items.isEmpty)
+                      const Padding(
+                        padding: EdgeInsets.symmetric(vertical: 16.0),
+                        child: Text('No traction recorded for this trip yet.'),
+                      )
+                    else
+                      SizedBox(
+                        height: MediaQuery.of(context).size.height * 0.6,
+                        child: ListView.builder(
+                          itemCount: items.length,
+                          itemBuilder: (context, index) {
+                            final loco = items[index];
+                            final won = loco.won;
+                            final isWon = won == true;
+                            return ListTile(
+                              leading: const Icon(Icons.train),
+                              title: Text('${loco.locoClass} ${loco.number}'),
+                              subtitle:
+                                  loco.name == null || loco.name!.isEmpty
+                                      ? null
+                                      : Text(loco.name!),
+                              trailing: Chip(
+                                label: Text(isWon ? 'Won' : 'Dud'),
+                                backgroundColor: isWon
+                                    ? Colors.green.shade100
+                                    : Colors.grey.shade300,
+                                labelStyle: TextStyle(
+                                  color: isWon
+                                      ? Colors.green.shade900
+                                      : Colors.grey.shade800,
+                                ),
+                              ),
+                            );
+                          },
+                        ),
+                      ),
+                  ],
+                ),
+              );
+            },
+          ),
+        );
+      },
+    );
+  }
 }

lib/main.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:dynamic_color/dynamic_color.dart';
 import 'package:mileograph_flutter/components/pages/calculator.dart';
-import 'package:mileograph_flutter/components/pages/newEntry.dart';
+import 'package:mileograph_flutter/components/pages/new_entry.dart';
 import 'package:mileograph_flutter/components/pages/traction.dart';
 import 'package:mileograph_flutter/components/pages/trips.dart';
 import 'package:provider/provider.dart';
@@ -13,7 +13,6 @@ import 'package:mileograph_flutter/services/dataService.dart';
 
 import 'components/login/login.dart';
 import 'components/pages/dashboard.dart';
-import 'components/dashboard/topTractionPanel.dart';
 
 import 'package:go_router/go_router.dart';
 
@@ -25,7 +24,7 @@ void main() {
       providers: [
         Provider<ApiService>(
           create: (_) {
-            api = ApiService(baseUrl: 'https://dev.mileograph.co.uk/api/v1');
+            api = ApiService(baseUrl: 'https://mileograph.co.uk/api/v1');
             return api;
           },
         ),
@@ -38,6 +37,7 @@ void main() {
         ProxyProvider<AuthService, void>(
           update: (_, auth, __) {
             api.setTokenProvider(() => auth.token);
+            api.setUnauthorizedHandler(() => auth.handleTokenExpired());
           },
         ),
         ChangeNotifierProxyProvider<ApiService, DataService>(
@@ -172,8 +172,9 @@ class _MyHomePageState extends State<MyHomePage> {
   }
 
   void _onItemTapped(int index, int currentIndex) {
-    if (index < 0 || index >= contentPages.length || index == currentIndex)
+    if (index < 0 || index >= contentPages.length || index == currentIndex) {
       return;
+    }
     context.push(contentPages[index]);
     _getIndexFromLocation(contentPages[index]);
   }
@@ -188,9 +189,13 @@ class _MyHomePageState extends State<MyHomePage> {
     if (!_fetched) {
       _fetched = true;
           WidgetsBinding.instance.addPostFrameCallback((_) {
+            Future(() async {
               final data = context.read<DataService>();
               final auth = context.read<AuthService>();
               api.setTokenProvider(() => auth.token);
+              await auth.tryRestoreSession();
+              if (!auth.isLoggedIn) return;
+              data.fetchEventFields();
               if (data.homepageStats == null) {
                 data.fetchHomepageStats();
               }
@@ -200,6 +205,13 @@ class _MyHomePageState extends State<MyHomePage> {
           if (data.traction.isEmpty) {
             data.fetchHadTraction();
           }
+          if (data.onThisDay.isEmpty) {
+            data.fetchOnThisDay();
+          }
+          if (data.tripDetails.isEmpty) {
+            data.fetchTripDetails();
+          }
+        });
       });
     }
   }
@@ -212,7 +224,7 @@ class _MyHomePageState extends State<MyHomePage> {
     final data = context.watch<DataService>();
     final auth = context.read<AuthService>();
 
-    if (data.homepageStats != null) {
+    if (data.homepageStats != null || !data.isHomepageLoading) {
       currentPage = widget.child;
     } else {
       currentPage = Center(child: CircularProgressIndicator());

lib/objects/objects.dart

@@ -41,6 +41,7 @@ class HomepageStats {
   final List<LocoSummary> topLocos;
   final List<LeaderboardEntry> leaderboard;
   final List<TripSummary> trips;
+  final UserData? user;
 
   HomepageStats({
     required this.totalMileage,
@@ -48,23 +49,37 @@ class HomepageStats {
     required this.topLocos,
     required this.leaderboard,
     required this.trips,
+    this.user,
   });
 
   factory HomepageStats.fromJson(Map<String, dynamic> json) {
+    final userData = json['user_data'];
+    final mileageData = json['milage_data'];
+    final totalMileage = mileageData is Map && mileageData['mileage'] != null
+        ? (mileageData['mileage'] as num).toDouble()
+        : 0.0;
     return HomepageStats(
-      totalMileage: (json['milage_data']['mileage'] as num).toDouble(),
+      totalMileage: totalMileage,
-      yearlyMileage: (json['yearly_mileage'] as List)
+      yearlyMileage: (json['yearly_mileage'] as List? ?? [])
           .map((e) => YearlyMileage.fromJson(e))
           .toList(),
-      topLocos: (json['top_locos'] as List)
+      topLocos: (json['top_locos'] as List? ?? [])
           .map((e) => LocoSummary.fromJson(e))
           .toList(),
-      leaderboard: (json['leaderboard_data'] as List)
+      leaderboard: (json['leaderboard_data'] as List? ?? [])
           .map((e) => LeaderboardEntry.fromJson(e))
           .toList(),
-      trips: (json['trip_data'] as List)
+      trips: (json['trip_data'] as List? ?? [])
           .map((e) => TripSummary.fromJson(e))
           .toList(),
+      user: userData == null
+          ? null
+          : UserData(
+              userData['username'] ?? '',
+              userData['full_name'] ?? '',
+              userData['user_id'] ?? '',
+              userData['email'] ?? '',
+            ),
     );
   }
 }
@@ -99,53 +114,79 @@ class Loco {
 
   factory Loco.fromJson(Map<String, dynamic> json) => Loco(
     id: json['loco_id'],
-    type: json['loco_type'],
+    type: json['type'],
-    number: json['loco_number'],
+    number: json['number'],
-    name: json['loco_name'] ?? "",
+    name: json['name'] ?? "",
-    locoClass: json['loco_class'],
+    locoClass: json['class'],
-    operator: json['loco_operator'],
+    operator: json['operator'],
-    notes: json['loco_notes'],
+    notes: json['notes'],
-    evn: json['loco_evn'],
+    evn: json['evn'],
   );
 }
 
 class LocoSummary extends Loco {
   final double? mileage;
   final int? journeys;
+  final int? trips;
+  final String? status;
+  final String? domain;
+  final String? owner;
+  final String? livery;
+  final String? location;
+  final Map<String, dynamic> extra;
 
   LocoSummary({
     required int locoId,
     required String locoType,
     required String locoNumber,
     required String locoName,
-    required String locoClass,
+    required super.locoClass,
     required String locoOperator,
     String? locoNotes,
     String? locoEvn,
     this.mileage,
     this.journeys,
-  }) : super(
+    this.trips,
+    this.status,
+    this.domain,
+    this.owner,
+    this.livery,
+    this.location,
+    Map<String, dynamic>? extra,
+  }) : extra = extra ?? const {},
+       super(
          id: locoId,
          type: locoType,
          number: locoNumber,
          name: locoName,
-         locoClass: locoClass,
          operator: locoOperator,
          notes: locoNotes,
          evn: locoEvn,
        );
 
   factory LocoSummary.fromJson(Map<String, dynamic> json) => LocoSummary(
-    locoId: json['loco_id'],
+    locoId: json['loco_id'] ?? json['id'] ?? 0,
-    locoType: json['loco_type'],
+    locoType: json['type'] ?? json['loco_type'] ?? '',
-    locoNumber: json['loco_number'],
+    locoNumber: json['number'] ?? json['loco_number'] ?? '',
-    locoName: json['loco_name'] ?? "",
+    locoName: json['name'] ?? json['loco_name'] ?? "",
-    locoClass: json['loco_class'],
+    locoClass: json['class'] ?? json['loco_class'] ?? '',
-    locoOperator: json['loco_operator'],
+    locoOperator: json['operator'] ?? json['loco_operator'] ?? '',
-    locoNotes: json['loco_notes'],
+    locoNotes: json['notes'],
-    locoEvn: json['loco_evn'],
+    locoEvn: json['evn'] ?? json['loco_evn'],
-    mileage: (json['loco_mileage'] as num?)?.toDouble() ?? 0,
+    mileage:
-    journeys: json['loco_journeys'] ?? 0,
+        ((json['loco_mileage'] ?? json['mileage']) as num?)?.toDouble() ?? 0,
+    journeys: (json['loco_journeys'] ?? json['journeys'] ?? 0) is num
+        ? (json['loco_journeys'] ?? json['journeys'] ?? 0).toInt()
+        : 0,
+    trips: (json['loco_trips'] ?? json['trips']) is num
+        ? (json['loco_trips'] ?? json['trips']).toInt()
+        : null,
+    status: json['status'] ?? json['loco_status'],
+    domain: json['domain'],
+    owner: json['owner'] ?? json['loco_owner'],
+    livery: json['livery'],
+    location: json['location'],
+    extra: Map<String, dynamic>.from(json),
   );
 }
 
@@ -285,3 +326,127 @@ class Station {
     country: json['country'],
   );
 }
+
+class TripLeg {
+  final int? id;
+  final String start;
+  final String end;
+  final DateTime? beginTime;
+  final String? network;
+  final String? route;
+  final double? mileage;
+  final String? notes;
+  final List<Loco> locos;
+
+  TripLeg({
+    required this.id,
+    required this.start,
+    required this.end,
+    required this.beginTime,
+    required this.network,
+    required this.route,
+    required this.mileage,
+    required this.notes,
+    required this.locos,
+  });
+
+  factory TripLeg.fromJson(Map<String, dynamic> json) => TripLeg(
+    id: json['leg_id'],
+    start: json['leg_start'] ?? '',
+    end: json['leg_end'] ?? '',
+    beginTime:
+        json['leg_begin_time'] != null && json['leg_begin_time'] is String
+        ? DateTime.tryParse(json['leg_begin_time'])
+        : (json['leg_begin_time'] is DateTime ? json['leg_begin_time'] : null),
+    network: json['leg_network'],
+    route: json['leg_route'],
+    mileage: (json['leg_mileage'] as num?)?.toDouble(),
+    notes: json['leg_notes'],
+    locos:
+        (json['locos'] as List?)
+            ?.map((e) => Loco.fromJson(e as Map<String, dynamic>))
+            .toList() ??
+        [],
+  );
+}
+
+class TripDetail {
+  final int id;
+  final String name;
+  final double mileage;
+  final int legCount;
+  final List<TripLeg> legs;
+
+  TripDetail({
+    required this.id,
+    required this.name,
+    required this.mileage,
+    required this.legCount,
+    required this.legs,
+  });
+
+  factory TripDetail.fromJson(Map<String, dynamic> json) => TripDetail(
+    id: json['trip_id'] ?? 0,
+    name: json['trip_name'] ?? '',
+    mileage: (json['trip_mileage'] as num?)?.toDouble() ?? 0,
+    legCount: json['leg_count'] ?? ((json['trip_legs'] as List?)?.length ?? 0),
+    legs:
+        (json['trip_legs'] as List?)
+            ?.map((e) => TripLeg.fromJson(e as Map<String, dynamic>))
+            .toList() ??
+        [],
+  );
+}
+
+class TripLocoStat {
+  final String locoClass;
+  final String number;
+  final String? name;
+  final bool won;
+
+  TripLocoStat({
+    required this.locoClass,
+    required this.number,
+    required this.won,
+    this.name,
+  });
+
+  factory TripLocoStat.fromJson(Map<String, dynamic> json) => TripLocoStat(
+    locoClass: json['loco_class'] ?? json['class'] ?? '',
+    number: json['loco_number'] ?? json['number'] ?? '',
+    name: json['loco_name'] ?? json['name'],
+    won: json['won'] == 1 ||
+        json['won'] == true ||
+        (json['won'] is String && json['won'].toString() == '1'),
+  );
+}
+
+class EventField {
+  final String name;
+  final String display;
+  final String? type;
+  final List<String>? enumValues;
+
+  const EventField({
+    required this.name,
+    required this.display,
+    this.type,
+    this.enumValues,
+  });
+
+  factory EventField.fromJson(Map<String, dynamic> json) {
+    final enumList = json['enum'];
+    List<String>? enumValues;
+    if (enumList is List) {
+      enumValues = enumList.map((e) => e.toString()).toList();
+    }
+    final baseName = json['name']?.toString() ?? json['field']?.toString() ?? '';
+    final display = json['field']?.toString() ?? baseName;
+    return EventField(
+      name: baseName,
+      display: display,
+      type: json['type']?.toString(),
+      enumValues: enumValues,
+    );
+  }
+}

lib/services/apiService.dart

@@ -2,10 +2,12 @@ import 'dart:convert';
 import 'package:http/http.dart' as http;
 
 typedef TokenProvider = String? Function();
+typedef UnauthorizedHandler = Future<void> Function();
 
 class ApiService {
   final String baseUrl;
   TokenProvider? _getToken;
+  UnauthorizedHandler? _onUnauthorized;
 
   ApiService({required this.baseUrl});
 
@@ -13,6 +15,10 @@ class ApiService {
     _getToken = provider;
   }
 
+  void setUnauthorizedHandler(UnauthorizedHandler handler) {
+    _onUnauthorized = handler;
+  }
+
   Map<String, String> _buildHeaders(Map<String, String>? extra) {
     final token = _getToken?.call();
     final headers = {'accept': 'application/json', ...?extra};
@@ -35,10 +41,11 @@ class ApiService {
     dynamic data, {
     Map<String, String>? headers,
   }) async {
+    final hasBody = data != null;
     final response = await http.post(
       Uri.parse('$baseUrl$endpoint'),
-      headers: _buildHeaders(_jsonHeaders(headers)),
+      headers: _buildHeaders(hasBody ? _jsonHeaders(headers) : headers),
-      body: jsonEncode(data),
+      body: hasBody ? jsonEncode(data) : null,
     );
     return _processResponse(response);
   }
@@ -60,10 +67,11 @@ class ApiService {
     dynamic data, {
     Map<String, String>? headers,
   }) async {
+    final hasBody = data != null;
     final response = await http.put(
       Uri.parse('$baseUrl$endpoint'),
-      headers: _buildHeaders(_jsonHeaders(headers)),
+      headers: _buildHeaders(hasBody ? _jsonHeaders(headers) : headers),
-      body: jsonEncode(data),
+      body: hasBody ? jsonEncode(data) : null,
     );
     return _processResponse(response);
   }
@@ -83,12 +91,19 @@ class ApiService {
     return {'Content-Type': 'application/json', if (extra != null) ...extra};
   }
 
-  dynamic _processResponse(http.Response res) {
+  Future<dynamic> _processResponse(http.Response res) async {
     final body = res.body.isNotEmpty ? jsonDecode(res.body) : null;
     if (res.statusCode >= 200 && res.statusCode < 300) {
       return body;
-    } else {
+    }
+
+    if (res.statusCode == 401 &&
+        body is Map<String, dynamic> &&
+        body['detail'] == 'Not authenticated' &&
+        _onUnauthorized != null) {
+      await _onUnauthorized!();
+    }
+
     throw Exception('API error ${res.statusCode}: $body');
   }
-  }
 }

lib/services/authservice.dart

@@ -1,9 +1,13 @@
 import 'package:flutter/foundation.dart';
 import 'package:mileograph_flutter/objects/objects.dart';
 import 'package:mileograph_flutter/services/apiService.dart';
+import 'package:mileograph_flutter/services/tokenStorageService.dart';
 
 class AuthService extends ChangeNotifier {
   final ApiService api;
+  bool _restoring = false;
+
+  final TokenStorageService _tokenStorage = TokenStorageService();
 
   AuthService({required this.api});
 
@@ -29,6 +33,7 @@ class AuthService extends ChangeNotifier {
       access_token: accessToken,
       email: email,
     );
+    _persistToken(accessToken);
     notifyListeners();
   }
 
@@ -65,8 +70,70 @@ class AuthService extends ChangeNotifier {
     );
   }
 
-  void logout() {
+  Future<void> tryRestoreSession() async {
+    if (_restoring || _user != null) return;
+      _restoring = true;
+      try {
+      // read token from secure storage (with fallback)
+      final token = await _tokenStorage.getToken();
+      if (token == null || token.isEmpty) return;
+
+      final userResponse = await api.get(
+        '/users/me',
+        headers: {
+          'Authorization': 'Bearer $token',
+          'accept': 'application/json',
+        },
+      );
+
+      setLoginData(
+        userId: userResponse['user_id'],
+        username: userResponse['username'],
+        fullName: userResponse['full_name'],
+        accessToken: token,
+        email: userResponse['email'],
+      );
+    } catch (_) {
+      await _clearToken();
+    } finally {
+      _restoring = false;
+    }
+  }
+
+  Future<void> _persistToken(String token) async {
+    await _tokenStorage.setToken(token);
+  }
+
+  Future<void> _clearToken() async {
+    await _tokenStorage.clearToken();
+  }
+
+  Future<void> register({
+    required String username,
+    required String email,
+    required String fullName,
+    required String password,
+    String inviteCode = '',
+  }) async {
+    final formData = {
+      'user_name': username,
+      'email': email,
+      'full_name': fullName,
+      'password': password,
+      'invitation_code': inviteCode,
+      'empty': '',
+      'empty2': '',
+    };
+    await api.postForm('/register', formData);
+  }
+
+  Future<void> handleTokenExpired() async {
     _user = null;
+    await _clearToken();
     notifyListeners();
   }
+
+  void logout() {
+    handleTokenExpired(); // reuse
+  }
 }

lib/services/dataService.dart

@@ -1,12 +1,33 @@
+import 'dart:async';
+
 import 'package:flutter/foundation.dart';
+import 'package:flutter/scheduler.dart';
 import 'package:mileograph_flutter/objects/objects.dart';
 import 'package:mileograph_flutter/services/apiService.dart'; // assumes you've moved HomepageStats + submodels to a separate file
 
+class _LegFetchOptions {
+  final int limit;
+  final String sortBy;
+  final int sortDirection;
+  final String? dateRangeStart;
+  final String? dateRangeEnd;
+
+  const _LegFetchOptions({
+    this.limit = 100,
+    this.sortBy = 'date',
+    this.sortDirection = 0,
+    this.dateRangeStart,
+    this.dateRangeEnd,
+  });
+}
+
 class DataService extends ChangeNotifier {
   final ApiService api;
 
   DataService({required this.api});
 
+  _LegFetchOptions _lastLegsFetch = const _LegFetchOptions();
+
   // Homepage Data
   HomepageStats? _homepageStats;
   HomepageStats? get homepageStats => _homepageStats;
@@ -14,10 +35,36 @@ class DataService extends ChangeNotifier {
   // Legs Data
   List<Leg> _legs = [];
   List<Leg> get legs => _legs;
+  List<Leg> _onThisDay = [];
+  List<Leg> get onThisDay => _onThisDay;
+  bool _isLegsLoading = false;
+  bool get isLegsLoading => _isLegsLoading;
+  bool _legsHasMore = false;
+  bool get legsHasMore => _legsHasMore;
 
   // Traction Data
   List<LocoSummary> _traction = [];
   List<LocoSummary> get traction => _traction;
+  bool _isTractionLoading = false;
+  bool get isTractionLoading => _isTractionLoading;
+  bool _tractionHasMore = false;
+  bool get tractionHasMore => _tractionHasMore;
+
+  // Trips
+  List<TripSummary> _trips = [];
+  List<TripSummary> get trips => _trips;
+  List<TripDetail> _tripDetails = [];
+  List<TripDetail> get tripDetails => _tripDetails;
+  bool _isTripDetailsLoading = false;
+  bool get isTripDetailsLoading => _isTripDetailsLoading;
+  List<String> _locoClasses = [];
+  List<String> get locoClasses => _locoClasses;
+  List<TripSummary> _tripList = [];
+  List<TripSummary> get tripList => _tripList;
+  List<EventField> _eventFields = [];
+  List<EventField> get eventFields => _eventFields;
+  bool _isEventFieldsLoading = false;
+  bool get isEventFieldsLoading => _isEventFieldsLoading;
 
   // Station Data
   List<Station>? _cachedStations;
@@ -27,20 +74,41 @@ class DataService extends ChangeNotifier {
 
   bool _isHomepageLoading = false;
   bool get isHomepageLoading => _isHomepageLoading;
+  bool _isOnThisDayLoading = false;
+  bool get isOnThisDayLoading => _isOnThisDayLoading;
+
+  static const List<EventField> _fallbackEventFields = [
+    EventField(name: 'operator', display: 'Operator'),
+    EventField(name: 'status', display: 'Status'),
+    EventField(name: 'evn', display: 'EVN'),
+    EventField(name: 'owner', display: 'Owner'),
+    EventField(name: 'location', display: 'Location'),
+    EventField(name: 'livery', display: 'Livery'),
+    EventField(name: 'domain', display: 'Domain'),
+    EventField(name: 'type', display: 'Type'),
+  ];
+
+  void _notifyAsync() {
+    // Always defer to the next frame to avoid setState during build.
+    SchedulerBinding.instance.addPostFrameCallback((_) {
+      notifyListeners();
+    });
+  }
 
   Future<void> fetchHomepageStats() async {
     _isHomepageLoading = true;
-    notifyListeners();
 
     try {
       final json = await api.get('/stats/homepage');
       _homepageStats = HomepageStats.fromJson(json);
+      _trips = _homepageStats?.trips ?? [];
     } catch (e) {
       debugPrint('Failed to fetch homepage stats: $e');
       _homepageStats = null;
+      _trips = [];
     } finally {
       _isHomepageLoading = false;
-      notifyListeners();
+      _notifyAsync();
     }
   }
 
@@ -49,34 +117,289 @@ class DataService extends ChangeNotifier {
     int limit = 100,
     String sortBy = 'date',
     int sortDirection = 0,
+    String? dateRangeStart,
+    String? dateRangeEnd,
+    bool append = false,
   }) async {
-    final query =
+    _isLegsLoading = true;
-        '?sort_direction=$sortDirection&sort_by=$sortBy&offset=$offset&limit=$limit';
+    if (!append) {
-    final json = await api.get('/user/legs$query');
+      _lastLegsFetch = _LegFetchOptions(
+        limit: limit,
+        sortBy: sortBy,
+        sortDirection: sortDirection,
+        dateRangeStart: dateRangeStart,
+        dateRangeEnd: dateRangeEnd,
+      );
+    }
+    final buffer = StringBuffer(
+      '?sort_direction=$sortDirection&sort_by=$sortBy&offset=$offset&limit=$limit',
+    );
+    if (dateRangeStart != null && dateRangeStart.isNotEmpty) {
+      buffer.write('&date_range_start=$dateRangeStart');
+    }
+    if (dateRangeEnd != null && dateRangeEnd.isNotEmpty) {
+      buffer.write('&date_range_end=$dateRangeEnd');
+    }
+    try {
+      final json = await api.get('/user/legs${buffer.toString()}');
 
       if (json is List) {
-      _legs = json.map((e) => Leg.fromJson(e)).toList();
+        final newLegs = json.map((e) => Leg.fromJson(e)).toList();
-      notifyListeners();
+        _legs = append ? [..._legs, ...newLegs] : newLegs;
+        _legsHasMore = newLegs.length >= limit;
       } else {
         throw Exception('Unexpected legs response: $json');
       }
+    } catch (e) {
+      debugPrint('Failed to fetch legs: $e');
+      if (!append) _legs = [];
+      _legsHasMore = false;
+    } finally {
+      _isLegsLoading = false;
+      _notifyAsync();
+    }
+  }
+
+  Future<void> refreshLegs() {
+    return fetchLegs(
+      limit: _lastLegsFetch.limit,
+      sortBy: _lastLegsFetch.sortBy,
+      sortDirection: _lastLegsFetch.sortDirection,
+      dateRangeStart: _lastLegsFetch.dateRangeStart,
+      dateRangeEnd: _lastLegsFetch.dateRangeEnd,
+    );
   }
 
   Future<void> fetchHadTraction({int offset = 0, int limit = 100}) async {
-    final query = '?offset=$offset&limit=$limit';
+    await fetchTraction(
-    final json = await api.get('/loco/mileage$query');
+      hadOnly: true,
+      offset: offset,
+      limit: limit,
+      append: offset > 0,
+    );
+  }
+
+  Future<void> fetchTraction({
+    bool hadOnly = false,
+    int offset = 0,
+    int limit = 50,
+    String? locoClass,
+    String? locoNumber,
+    bool mileageFirst = true,
+    bool append = false,
+    Map<String, dynamic>? filters,
+  }) async {
+    _isTractionLoading = true;
+
+    try {
+      final params = StringBuffer('?limit=$limit&offset=$offset');
+      if (hadOnly) params.write('&had_only=true');
+      if (!mileageFirst) params.write('&mileage_first=false');
+
+      final payload = <String, dynamic>{};
+      if (locoClass != null && locoClass.isNotEmpty) {
+        payload['class'] = locoClass;
+      }
+      if (locoNumber != null && locoNumber.isNotEmpty) {
+        payload['number'] = locoNumber;
+      }
+      if (filters != null) {
+        filters.forEach((key, value) {
+          if (value == null) return;
+          if (value is String && value.trim().isEmpty) return;
+          payload[key] = value;
+        });
+      }
+
+      final json = await api.post(
+        '/locos/search/v2${params.toString()}',
+        payload.isEmpty ? null : payload,
+      );
 
       if (json is List) {
-      _traction = json.map((e) => LocoSummary.fromJson(e)).toList();
+        final newItems = json.map((e) => LocoSummary.fromJson(e)).toList();
-      notifyListeners();
+        _traction = append ? [..._traction, ...newItems] : newItems;
+        _tractionHasMore = newItems.length >= limit - 1;
       } else {
         throw Exception('Unexpected traction response: $json');
       }
+    } catch (e) {
+      debugPrint('Failed to fetch traction: $e');
+      if (!append) {
+        _traction = [];
+      }
+      _tractionHasMore = false;
+    } finally {
+      _isTractionLoading = false;
+      _notifyAsync();
+    }
+  }
+
+  Future<void> fetchOnThisDay({DateTime? date}) async {
+    _isOnThisDayLoading = true;
+    final target = date ?? DateTime.now();
+    final formatted =
+        "${target.year.toString().padLeft(4, '0')}-${target.month.toString().padLeft(2, '0')}-${target.day.toString().padLeft(2, '0')}";
+    try {
+      final json = await api.get('/legs/on-this-day?date=$formatted');
+      if (json is List) {
+        _onThisDay = json.map((e) => Leg.fromJson(e)).toList();
+      } else {
+        _onThisDay = [];
+      }
+    } catch (e) {
+      debugPrint('Failed to fetch on-this-day legs: $e');
+      _onThisDay = [];
+    } finally {
+      _isOnThisDayLoading = false;
+      _notifyAsync();
+    }
+  }
+
+  Future<void> fetchTripDetails() async {
+    _isTripDetailsLoading = true;
+    try {
+      final json = await api.get('/trips/legs-and-stats');
+      if (json is List) {
+        final trip_map = json.map((e) => TripDetail.fromJson(e)).toList();
+        _tripDetails = [...trip_map]..sort((a, b) => b.id.compareTo(a.id));
+      } else {
+        _tripDetails = [];
+      }
+    } catch (e) {
+      debugPrint('Failed to fetch trip_map: $e');
+      _tripDetails = [];
+    } finally {
+      _isTripDetailsLoading = false;
+      _notifyAsync();
+    }
+  }
+
+  Future<List<TripLocoStat>> fetchTripLocoStats(int tripId) async {
+    try {
+      final json = await api.get('/trips/stats?trip_id=$tripId');
+      if (json is List) {
+        return json
+            .whereType<Map<String, dynamic>>()
+            .map((e) => TripLocoStat.fromJson(e))
+            .toList();
+      }
+      if (json is Map && json['locos'] is List) {
+        return (json['locos'] as List)
+            .whereType<Map<String, dynamic>>()
+            .map((e) => TripLocoStat.fromJson(e))
+            .toList();
+      }
+      return [];
+    } catch (e) {
+      debugPrint('Failed to fetch trip loco stats: $e');
+      return [];
+    }
+  }
+
+  Future<void> fetchEventFields({bool force = false}) async {
+    if (_eventFields.isNotEmpty && !force) return;
+    _isEventFieldsLoading = true;
+    _notifyAsync();
+    try {
+      final json = await api.get('/event/fields');
+      List<EventField> fields = _parseEventFields(json);
+      if (fields.isEmpty) {
+        fields = _fallbackEventFields;
+      }
+      _eventFields = fields;
+    } catch (e) {
+      debugPrint('Failed to fetch event fields: $e');
+      _eventFields = _fallbackEventFields;
+    } finally {
+      _isEventFieldsLoading = false;
+      _notifyAsync();
+    }
+  }
+
+  List<EventField> _parseEventFields(dynamic json) {
+    if (json is List) {
+      return json
+          .whereType<Map<String, dynamic>>()
+          .map(EventField.fromJson)
+          .toList();
+    }
+    if (json is Map) {
+      if (json['fields'] is List) {
+        return (json['fields'] as List)
+            .whereType<Map<String, dynamic>>()
+            .map(EventField.fromJson)
+            .toList();
+      }
+      // If map of name -> definition
+      return json.entries
+          .where((entry) => entry.value is Map<String, dynamic>)
+          .map((entry) {
+            final map = Map<String, dynamic>.from(entry.value);
+            map['name'] = entry.key;
+            return EventField.fromJson(map);
+          })
+          .toList();
+    }
+    return [];
+  }
+
+  Future<void> fetchTrips() async {
+    try {
+      final json = await api.get('/trips/mileage');
+      Iterable<dynamic>? raw;
+      if (json is List) {
+        raw = json;
+      } else if (json is Map) {
+        for (final key in ['trips', 'trip_data', 'data']) {
+          final value = json[key];
+          if (value is List) {
+            raw = value;
+            break;
+          }
+        }
+      }
+      if (raw != null) {
+        final trip_map = raw
+            .whereType<Map<String, dynamic>>()
+            .map((e) => TripSummary.fromJson(e))
+            .toList();
+
+        _tripList = [...trip_map]..sort((a, b) => b.tripId.compareTo(a.tripId));
+      } else {
+        debugPrint('Unexpected trip list response: $json');
+        _tripList = [];
+      }
+    } catch (e) {
+      debugPrint('Failed to fetch trip list: $e');
+      _tripList = [];
+    } finally {
+      _notifyAsync();
+    }
+  }
+
+  Future<List<String>> fetchClassList() async {
+    if (_locoClasses.isNotEmpty) return _locoClasses;
+    try {
+      final json = await api.get('/loco/classlist');
+      if (json is List) {
+        _locoClasses = json.map((e) => e.toString()).toList();
+        _notifyAsync();
+      }
+    } catch (e) {
+      debugPrint('Failed to fetch class list: $e');
+    }
+    return _locoClasses;
   }
 
   void clear() {
     _homepageStats = null;
-    notifyListeners();
+    _legs = [];
+    _onThisDay = [];
+    _trips = [];
+    _tripDetails = [];
+    _eventFields = [];
+    _notifyAsync();
   }
 
   double getMileageForCurrentYear() {

lib/services/tokenStorageService.dart

@@ -0,0 +1,57 @@
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+/// Stores the auth token in secure storage and falls back to SharedPreferences
+/// so debug builds and platforms without a working keyring still persist.
+class TokenStorageService {
+  TokenStorageService._internal();
+
+  static final TokenStorageService _instance = TokenStorageService._internal();
+
+  factory TokenStorageService() => _instance;
+
+  static const _tokenKey = 'auth_token';
+  final FlutterSecureStorage _secureStorage = const FlutterSecureStorage();
+
+  Future<SharedPreferences> get _prefs async =>
+      await SharedPreferences.getInstance();
+
+  Future<void> setToken(String token) async {
+    try {
+      await _secureStorage.write(key: _tokenKey, value: token);
+    } catch (_) {
+      // ignore secure storage failures in debug/unsupported environments
+    }
+    final prefs = await _prefs;
+    await prefs.setString(_tokenKey, token);
+  }
+
+  Future<String?> getToken() async {
+    try {
+      final secured = await _secureStorage.read(key: _tokenKey);
+      if (secured != null && secured.isNotEmpty) {
+        return secured;
+      }
+    } catch (_) {
+      // ignore and fall back
+    }
+    final prefs = await _prefs;
+    final token = prefs.getString(_tokenKey);
+    return (token == null || token.isEmpty) ? null : token;
+  }
+
+  Future<void> clearToken() async {
+    try {
+      await _secureStorage.delete(key: _tokenKey);
+    } catch (_) {
+      // ignore
+    }
+    final prefs = await _prefs;
+    await prefs.remove(_tokenKey);
+  }
+
+  Future<bool> hasToken() async {
+    final token = await getToken();
+    return token != null && token.isNotEmpty;
+  }
+}

linux/flutter/generated_plugin_registrant.cc

@@ -7,9 +7,13 @@
 #include "generated_plugin_registrant.h"
 
 #include <dynamic_color/dynamic_color_plugin.h>
+#include <flutter_secure_storage_linux/flutter_secure_storage_linux_plugin.h>
 
 void fl_register_plugins(FlPluginRegistry* registry) {
   g_autoptr(FlPluginRegistrar) dynamic_color_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "DynamicColorPlugin");
   dynamic_color_plugin_register_with_registrar(dynamic_color_registrar);
+  g_autoptr(FlPluginRegistrar) flutter_secure_storage_linux_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterSecureStorageLinuxPlugin");
+  flutter_secure_storage_linux_plugin_register_with_registrar(flutter_secure_storage_linux_registrar);
 }

linux/flutter/generated_plugins.cmake

@@ -4,6 +4,7 @@
 
 list(APPEND FLUTTER_PLUGIN_LIST
   dynamic_color
+  flutter_secure_storage_linux
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -6,7 +6,13 @@ import FlutterMacOS
 import Foundation
 
 import dynamic_color
+import flutter_secure_storage_darwin
+import path_provider_foundation
+import shared_preferences_foundation
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   DynamicColorPlugin.register(with: registry.registrar(forPlugin: "DynamicColorPlugin"))
+  FlutterSecureStorageDarwinPlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStorageDarwinPlugin"))
+  PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
+  SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
 }

pubspec.lock

@@ -65,6 +65,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.3.3"
+  ffi:
+    dependency: transitive
+    description:
+      name: ffi
+      sha256: "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.4"
+  file:
+    dependency: transitive
+    description:
+      name: file
+      sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.0.1"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -78,6 +94,54 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.0.0"
+  flutter_secure_storage:
+    dependency: "direct main"
+    description:
+      name: flutter_secure_storage
+      sha256: da922f2aab2d733db7e011a6bcc4a825b844892d4edd6df83ff156b09a9b2e40
+      url: "https://pub.dev"
+    source: hosted
+    version: "10.0.0"
+  flutter_secure_storage_darwin:
+    dependency: transitive
+    description:
+      name: flutter_secure_storage_darwin
+      sha256: "8878c25136a79def1668c75985e8e193d9d7d095453ec28730da0315dc69aee3"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.0"
+  flutter_secure_storage_linux:
+    dependency: transitive
+    description:
+      name: flutter_secure_storage_linux
+      sha256: "2b5c76dce569ab752d55a1cee6a2242bcc11fdba927078fb88c503f150767cda"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.0"
+  flutter_secure_storage_platform_interface:
+    dependency: transitive
+    description:
+      name: flutter_secure_storage_platform_interface
+      sha256: "8ceea1223bee3c6ac1a22dabd8feefc550e4729b3675de4b5900f55afcb435d6"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.1"
+  flutter_secure_storage_web:
+    dependency: transitive
+    description:
+      name: flutter_secure_storage_web
+      sha256: "6a1137df62b84b54261dca582c1c09ea72f4f9a4b2fcee21b025964132d5d0c3"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.0"
+  flutter_secure_storage_windows:
+    dependency: transitive
+    description:
+      name: flutter_secure_storage_windows
+      sha256: "3b7c8e068875dfd46719ff57c90d8c459c87f2302ed6b00ff006b3c9fcad1613"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.1.0"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -112,6 +176,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.1.2"
+  intl:
+    dependency: "direct main"
+    description:
+      name: intl
+      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.19.0"
   leak_tracker:
     dependency: transitive
     description:
@@ -192,6 +264,70 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.9.1"
+  path_provider:
+    dependency: transitive
+    description:
+      name: path_provider
+      sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.5"
+  path_provider_android:
+    dependency: transitive
+    description:
+      name: path_provider_android
+      sha256: "3b4c1fc3aa55ddc9cd4aa6759984330d5c8e66aa7702a6223c61540dc6380c37"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.19"
+  path_provider_foundation:
+    dependency: transitive
+    description:
+      name: path_provider_foundation
+      sha256: "16eef174aacb07e09c351502740fa6254c165757638eba1e9116b0a781201bbd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.2"
+  path_provider_linux:
+    dependency: transitive
+    description:
+      name: path_provider_linux
+      sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.1"
+  path_provider_platform_interface:
+    dependency: transitive
+    description:
+      name: path_provider_platform_interface
+      sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.2"
+  path_provider_windows:
+    dependency: transitive
+    description:
+      name: path_provider_windows
+      sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.0"
+  platform:
+    dependency: transitive
+    description:
+      name: platform
+      sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.6"
+  plugin_platform_interface:
+    dependency: transitive
+    description:
+      name: plugin_platform_interface
+      sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.8"
   provider:
     dependency: "direct main"
     description:
@@ -200,6 +336,62 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.1.5"
+  shared_preferences:
+    dependency: "direct main"
+    description:
+      name: shared_preferences
+      sha256: "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.5.3"
+  shared_preferences_android:
+    dependency: transitive
+    description:
+      name: shared_preferences_android
+      sha256: bd14436108211b0d4ee5038689a56d4ae3620fd72fd6036e113bf1345bc74d9e
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.13"
+  shared_preferences_foundation:
+    dependency: transitive
+    description:
+      name: shared_preferences_foundation
+      sha256: "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.5.4"
+  shared_preferences_linux:
+    dependency: transitive
+    description:
+      name: shared_preferences_linux
+      sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.1"
+  shared_preferences_platform_interface:
+    dependency: transitive
+    description:
+      name: shared_preferences_platform_interface
+      sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.1"
+  shared_preferences_web:
+    dependency: transitive
+    description:
+      name: shared_preferences_web
+      sha256: c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.3"
+  shared_preferences_windows:
+    dependency: transitive
+    description:
+      name: shared_preferences_windows
+      sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.1"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -285,6 +477,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.1"
+  win32:
+    dependency: transitive
+    description:
+      name: win32
+      sha256: d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.15.0"
+  xdg_directories:
+    dependency: transitive
+    description:
+      name: xdg_directories
+      sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
 sdks:
   dart: ">=3.8.1 <4.0.0"
-  flutter: ">=3.27.0"
+  flutter: ">=3.29.0"

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: 1.0.0+1
+version: 0.1.2+1
 
 environment:
   sdk: ^3.8.1
@@ -30,9 +30,12 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
+  intl: ^0.19.0
+  shared_preferences: ^2.2.2
   http: ^1.4.0
   provider: ^6.1.5
   dynamic_color: ^1.6.6
+  flutter_secure_storage: ^10.0.0
 
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.

windows/flutter/generated_plugin_registrant.cc

@@ -7,8 +7,11 @@
 #include "generated_plugin_registrant.h"
 
 #include <dynamic_color/dynamic_color_plugin_c_api.h>
+#include <flutter_secure_storage_windows/flutter_secure_storage_windows_plugin.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
   DynamicColorPluginCApiRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("DynamicColorPluginCApi"));
+  FlutterSecureStorageWindowsPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("FlutterSecureStorageWindowsPlugin"));
 }

windows/flutter/generated_plugins.cmake

@@ -4,6 +4,7 @@
 
 list(APPEND FLUTTER_PLUGIN_LIST
   dynamic_color
+  flutter_secure_storage_windows
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST