Merge pull request 'Add a flight arc on the map for flights with same departing and arrival airport' (#18) from add-same-point-flights into main

Reviewed-on: #18

app/Console/Commands/RecalculateAchievements.php

@@ -3,19 +3,35 @@
 namespace App\Console\Commands;
 
 use App\Models\User;
+use Illuminate\Console\Attributes\Argument;
 use Illuminate\Console\Attributes\Description;
 use Illuminate\Console\Attributes\Signature;
 use Illuminate\Console\Command;
 
-#[Signature('app:recalculate-achivements')]
+#[Signature('app:recalculate-achievements {username? : The username of a single user to recalculate}')]
-#[Description('Recalculate achievements for all users')]
+#[Description('Recalculate achievements for all users, or a single user by username')]
 class RecalculateAchievements extends Command
 {
     public function handle(): void
     {
-        $users = User::all();
+        $username = $this->argument('username');
-        foreach ($users as $user) {
+
+        if ($username) {
+            $user = User::where('name', $username)->first();
+
+            if (! $user) {
+                $this->error("No user found with username [{$username}].");
+                return;
+            }
+
             $user->calculateAchievements();
+            $this->info("Recalculated achievements for {$username}.");
+            return;
         }
+
+        $users = User::all();
+        $this->withProgressBar($users, fn (User $user) => $user->calculateAchievements());
+        $this->newLine();
+        $this->info("Recalculated achievements for {$users->count()} users.");
     }
 }

app/Http/Controllers/AdminController.php

@@ -7,6 +7,7 @@ use App\Models\IgnoredMissingLivery;
 use App\Models\User;
 use App\Models\UserFlight;
 use App\Services\AdminService;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Carbon;
 use Inertia\Inertia;
@@ -66,4 +67,17 @@ class AdminController extends Controller
         return back();
     }
 
+    public function ignoreMissingAirline(Request $request): JsonResponse
+    {
+        $validated = $request->validate([
+            'flight_id' => ['required', 'integer', 'exists:user_flights,id'],
+        ]);
+
+        $flight = UserFlight::findOrFail($validated['flight_id']);
+
+        $flight->ignoreMissingAirline()->firstOrCreate([]);
+
+        return response()->json(['status' => 'ok']);
+    }
+
 }

app/Http/Controllers/FlightController.php

@@ -245,15 +245,19 @@ class FlightController extends Controller
         $newFlight = auth()->user()->flights()->create($this->flightPayload($validated));
 
         UserAction::create([
-            'user_id'        => $newFlight->user_id,
+            'user_id' => $newFlight->user_id,
-            'type'           => $newFlight->departure_date->isFuture() ? 'flight_booked' : 'flight_logged',
+            'type'    => $newFlight->departure_date->isFuture() ? 'flight_booked' : 'flight_logged',
-            'data'           => [
+            'data'    => [
                 'flight' => $newFlight->snapshot($newFlight->id),
             ],
         ]);
 
+        if ($request->boolean('add_more')) {
+            return redirect()->route('flights.add')
+                ->with('success', 'Flight saved. Add another below.');
+        }
 
-        return redirect()->route('profile.departure-board', [Auth::user()->name, $newFlight->id]);
+        return redirect()->route('profile.flight', [Auth::user()->name, $newFlight->id]);
     }
 
 

app/Http/Controllers/SearchController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers;
 use App\Models\Aircraft;
 use App\Models\Airline;
 use App\Models\Airport;
+use App\Models\User;
 use Illuminate\Http\Request;
 
 class SearchController extends Controller
@@ -82,4 +83,23 @@ class SearchController extends Controller
             ])
             ->values();
     }
+
+
+
+    public function users()
+    {
+        $q = request('q', '');
+
+        if (strlen($q) < 2) return [];
+
+        return User::where('name', 'ilike', "%{$q}%")
+            ->orderBy('name')
+            ->limit(50)
+            ->get(['id', 'name'])
+            ->map(fn($user) => [
+                'value' => $user->id,
+                'title' => $user->name,
+            ])
+            ->values();
+    }
 }

app/Http/Controllers/UserProfileController.php

@@ -3,7 +3,9 @@
 namespace App\Http\Controllers;
 
 use App\Models\Achievement;
+use App\Models\AchievementCategory;
 use App\Models\Aircraft;
+use App\Models\Airport;
 use App\Models\Alliance;
 use App\Models\Continent;
 use App\Models\Country;
@@ -102,9 +104,16 @@ class UserProfileController extends Controller
         $canView =  Gate::allows('viewProfileData', $user);
 
         $achievements = Achievement::with(['category', 'difficulty'])
+            ->orderBy('id', 'asc')
             ->get()
-            ->groupBy(fn(Achievement $a) => $a->category->name)
+            ->groupBy(fn(Achievement $a) => $a->category->internal_name)
-            ->map(fn($group) => $group->sortBy('sort_order')->values());
+            ->sortBy(function ($group, $internalName) {
+                $index = array_search($internalName, AchievementCategory::ORDER);
+                return $index === false ? PHP_INT_MAX : $index;
+            })
+            ->mapWithKeys(fn($group) => [
+                $group->first()->category->name => $group->sortBy('sort_order')->values(),
+            ]);
 
         $userAchievements = $user->achievements()
             ->with('achievement')
@@ -171,6 +180,11 @@ class UserProfileController extends Controller
             default => null,
         };
 
+        $majorAlliances = match($achievement->internal_name){
+            'airlines_alliances.all_major_alliances' => Alliance::MAJOR_ALLIANCES,
+            default => [],
+        };
+
         $continents = match($achievement->internal_name){
             'countries_continents.all_continent_pairs_one_way', 'countries_continents.all_continent_pairs_both_ways' => Continent::all()->toArray(),
             default => [],
@@ -193,6 +207,11 @@ class UserProfileController extends Controller
             default => [],
         };
 
+        $londonAirports = match($achievement->internal_name){
+            'fun_challenges.all_london_airports' => Airport::LONDON_AIRPORTS,
+            default => [],
+        };
+
         $canView = Gate::allows('viewProfileData', $user);
 
         return Inertia::render('Profile/UserAchievement', [
@@ -206,7 +225,9 @@ class UserProfileController extends Controller
             'airlines'        => $airlines,
             'continents'      => $continents,
             'aircraft_families' => $aircraftFamilies,
+            'london_airports' => $londonAirports,
             'achievementCount' => $user->unlockedAchievements()->count(),
+            'majorAlliances' => Alliance::whereIn('internal_name', $majorAlliances)->get(),
             'canView' => $canView,
         ]);
     }

app/Http/Middleware/HandleInertiaRequests.php

@@ -38,6 +38,7 @@ class HandleInertiaRequests extends Middleware
                 'roles' => $request->user()?->getRoleNames() ?? [],
                 'permissions' => $request->user()?->getAllPermissions()->pluck('name') ?? [],
                 'apiToken' => session('api_token'),
+                'following' => $request->user()?->following()->with('followee')->get()->pluck('followee')->filter()->pluck('name')->toArray() ?? [],
             ],
             'flash' => [
                 'success' => $request->session()->get('success'),

app/Models/AchievementCategory.php

@@ -16,6 +16,16 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
  */
 class AchievementCategory extends Model
 {
+    const array ORDER = [
+        'number_of_flights',
+        'distance',
+        'general_flying',
+        'countries_and_continents',
+        'aircraft',
+        'airlines_and_alliances',
+        'fun_challenges',
+    ];
+
     protected $fillable = [
         'internal_name',
         'name',

app/Models/Airport.php

@@ -33,6 +33,10 @@ class Airport extends Model
         'display_name',
     ];
 
+    const array LONDON_AIRPORTS = [
+        'LHR', 'LGW', 'STN', 'LTN', 'LCY', 'SEN',
+    ];
+
     protected function displayName() : Attribute{
         return Attribute::make(
             get: function () {

app/Models/Alliance.php

@@ -26,6 +26,9 @@ class Alliance extends Model
         'skyteam' => 'airlines_alliances.all_skyteam',
     ];
 
+    const array MAJOR_ALLIANCES = ['skyteam', 'oneworld', 'star_alliance'];
+
+
     public function airlines(): HasMany
     {
         return $this->hasMany(Airline::class);

app/Models/UserFlight.php

@@ -9,6 +9,7 @@ use Illuminate\Database\Eloquent\Casts\Attribute;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Storage;
 
@@ -271,6 +272,16 @@ class UserFlight extends Model
     }
 
 
+    public function ignoreMissingAirline(): HasOne
+    {
+        return $this->hasOne(UserFlightIgnoreMissingAirline::class);
+    }
+
+    public function isIgnoringMissingAirline(): bool
+    {
+        return $this->ignoreMissingAirline()->exists();
+    }
+
     public function aircraft(): BelongsTo
     {
         return $this->belongsTo(Aircraft::class);

app/Models/UserFlightIgnoreMissingAirline.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class UserFlightIgnoreMissingAirline extends Model
+{
+    protected $table = 'user_flights_ignore_missing_airlines';
+
+    protected $fillable = [
+        'user_flight_id',
+    ];
+
+    public function userFlight(): BelongsTo
+    {
+        return $this->belongsTo(UserFlight::class);
+    }
+}

app/Services/Achievements/AchievementService.php

@@ -12,6 +12,7 @@ use App\Services\Achievements\Checkers\AchievementCheckerInterface;
 use App\Services\Achievements\Checkers\AircraftChecker;
 use App\Services\Achievements\Checkers\CountriesAndContinentsChecker;
 use App\Services\Achievements\Checkers\AirlinesAndAlliancesChecker;
+use App\Services\Achievements\Checkers\DistanceChecker;
 use App\Services\Achievements\Checkers\FunChallengesChecker;
 use App\Services\Achievements\Checkers\GeneralFlyingChecker;
 use Illuminate\Support\Collection;
@@ -30,6 +31,7 @@ class AchievementService
         AircraftChecker::class,
         AirlinesAndAlliancesChecker::class,
         FunChallengesChecker::class,
+        DistanceChecker::class,
     ];
 
     public function __construct()
@@ -45,6 +47,7 @@ class AchievementService
      * @var Collection<int,UserFlight> $flights
      */
     private Collection $flights;
+    private int $loggedFlightCount;
 
     public function calculate(User $user): void
     {
@@ -62,20 +65,24 @@ class AchievementService
             'arrivalAirport.region.continent',
         ])->where('departure_date', '<=', now('UTC'))->get();
 
+        $this->loggedFlightCount = $user->flights()->count();
+
         foreach ($this->checkers as $checkerClass) {
             $checker = new $checkerClass($this);
             $checker->check($user);
         }
     }
 
-    /**
-     * @return Collection<int,UserFlight>
-     */
     public function getFlights(): Collection
     {
         return $this->flights;
     }
 
+    public function getLoggedFlightCount(): int
+    {
+        return $this->loggedFlightCount;
+    }
+
 
     // ---------------------------------------------------------------
     // Award / revoke
@@ -91,7 +98,8 @@ class AchievementService
             ->where('achievement_id', $achievement->id)
             ->first();
 
-        $alreadyUnlocked = $existing !== null;
+        $alreadyUnlocked = $existing !== null
+            && (! $achievement->progressive || $existing->progress >= $achievement->threshold);
 
         UserAchievement::updateOrCreate(
             ['user_id' => $user->id, 'achievement_id' => $achievement->id],

app/Services/Achievements/Checkers/AirlinesAndAlliancesChecker.php

@@ -28,6 +28,12 @@ class AirlinesAndAlliancesChecker extends BaseChecker
 
         $check = fn(string $alliance): int => $flownAllianceAirlines->get($alliance, 0);
 
+        $majorAlliancesFlown = collect(Alliance::MAJOR_ALLIANCES)
+            ->filter(fn(string $alliance) => $check($alliance) > 0)
+            ->count();
+
+        $this->awardProgress($majorAlliancesFlown, 'airlines_alliances.all_major_alliances');
+
         $this->awardProgress($check('skyteam'),          'airlines_alliances.all_skyteam');
         $this->awardProgress($check('oneworld'),         'airlines_alliances.all_oneworld');
         $this->awardProgress($check('star_alliance'),    'airlines_alliances.all_star_alliance');
@@ -40,6 +46,8 @@ class AirlinesAndAlliancesChecker extends BaseChecker
 
         $checkGroup = fn(array $group): int => $flownAirlines->intersect($group)->count();
 
+
+
         $this->awardProgress($checkGroup(self::ME_3), 'airlines_alliances.me3');
         $this->awardProgress($checkGroup(self::US_3), 'airlines_alliances.us3');
         $this->awardProgress($checkGroup(self::CN_3), 'airlines_alliances.cn3');

app/Services/Achievements/Checkers/BaseChecker.php

@@ -15,6 +15,11 @@ abstract class BaseChecker implements AchievementCheckerInterface
         return $this->service->getFlights();
     }
 
+    protected function allLoggedFlightsCount(): int
+    {
+        return $this->service->getLoggedFlightCount();
+    }
+
     /**
      * Resolve an achievement ID from its internal name.
      * Results are cached on the service so repeated lookups are free.

app/Services/Achievements/Checkers/DistanceChecker.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Services\Achievements\Checkers;
+
+use App\Models\User;
+use App\Models\UserFlight;
+use Illuminate\Database\Eloquent\Collection;
+
+class DistanceChecker extends BaseChecker
+{
+    public function check(): void
+    {
+        /**
+         * @var $flights Collection<int, UserFlight>
+         */
+        $flights = $this->flights();
+
+        $totalDistance = $flights->sum('distance');
+
+        $this->awardProgress((int) $totalDistance, 'distance.circumference_of_the_earth');
+        $this->awardProgress((int) $totalDistance, 'distance.to_the_moon');
+        $this->awardProgress((int) $totalDistance, 'distance.gigametre');
+        $this->awardProgress((int) $totalDistance, 'distance.million_miles');
+
+    }
+}

app/Services/Achievements/Checkers/FunChallengesChecker.php

@@ -2,6 +2,7 @@
 
 namespace App\Services\Achievements\Checkers;
 
+use App\Models\Airport;
 use App\Models\User;
 use App\Models\UserFlight;
 
@@ -131,5 +132,19 @@ class FunChallengesChecker extends BaseChecker
             ->count();
 
         $this->awardProgress($visitedCanadianProvinces, 'fun_challenges.canadian_provinces');
+
+        // --- London Airports ---
+        $visitedLondonAirports = $flights
+            ->flatMap(fn(UserFlight $f) => [
+                $f->departureAirport?->iata_code,
+                $f->arrivalAirport?->iata_code,
+            ])
+            ->filter()
+            ->map(fn($code) => strtoupper($code))
+            ->filter(fn($code) => in_array($code, Airport::LONDON_AIRPORTS))
+            ->unique()
+            ->count();
+
+        $this->awardProgress($visitedLondonAirports, 'fun_challenges.all_london_airports');
     }
 }

app/Services/Achievements/Checkers/GeneralFlyingChecker.php

@@ -15,10 +15,11 @@ class GeneralFlyingChecker extends BaseChecker
          */
         $flights = $this->flights();
         $count   = $flights->count();
+        $allLoggedFlightsCount = $this->allLoggedFlightsCount();
 
         // --- Boolean achievements ---
 
-        $this->awardIf($count >= 1, 'general_flying.first_flight');
+        $this->awardIf($allLoggedFlightsCount >= 1, 'general_flying.first_flight');
 
         $this->awardIf(
             $flights->contains(fn ($f) => $f->isDomestic()),
@@ -68,14 +69,6 @@ class GeneralFlyingChecker extends BaseChecker
             'general_flying.domestic_two_countries'
         );
 
-        // --- Progressive achievements ---
-
-        $totalDistance = $flights->sum('distance');
-
-        $this->awardProgress((int) $totalDistance, 'general_flying.circumference_of_the_earth');
-        $this->awardProgress((int) $totalDistance, 'general_flying.to_the_moon');
-        $this->awardProgress((int) $totalDistance, 'general_flying.gigametre');
-
         $this->awardProgress($count,'general_flying.10_flights');
         $this->awardProgress($count,'general_flying.50_flights');
         $this->awardProgress($count,'general_flying.100_flights');

app/Services/AdminService.php

@@ -51,26 +51,28 @@ class AdminService
     {
         $flights = UserFlight::whereNotNull('flight_number')
             ->whereNull('airline_id')
-            ->with('user:id,name') // adjust to your actual user relation/columns
+            ->whereDoesntHave('ignoreMissingAirline')
+            ->with('user:id,name')
             ->get(['id', 'flight_number', 'user_id']);
 
         return $flights
             ->map(function ($flight) {
-                // Extract the 2-character IATA-style prefix (letters and/or digits)
                 preg_match('/^([A-Za-z0-9]{2})\d+/', trim($flight->flight_number), $matches);
 
                 return [
+                    'id' => $flight->id,
                     'code' => $matches[1] ?? null,
                     'flight_number' => $flight->flight_number,
                     'link' => "/u/{$flight->user->name}/flight/{$flight->id}",
                 ];
             })
-            ->filter(fn ($f) => $f['code'] !== null) // drop any that didn't match the pattern
+            ->filter(fn ($f) => $f['code'] !== null)
             ->groupBy('code')
             ->map(function ($group, $code) {
                 return [
                     'code' => $code,
                     'flights' => $group->map(fn ($f) => [
+                        'id' => $f['id'],
                         'flight_number' => $f['flight_number'],
                         'link' => $f['link'],
                     ])->values()->all(),

app/Settings/SettingsRegistry.php

@@ -72,7 +72,7 @@ class SettingsRegistry
                 'type'    => 'select',
                 'label'   => 'Default Page',
                 'category' => 'FlightsGoneBy Settings',
-                'default' => 'feed_first',
+                'default' => 'profile',
                 'options' => [
                     ['value' => 'feed_first', 'label' => 'My Feed if Following People, My Profile if Not'],
                     ['value' => 'profile', 'label' => 'My Profile'],
@@ -155,7 +155,7 @@ class SettingsRegistry
                     ['value' => 'seat_type_id', 'label' => 'Seat Type'],
                     ['value' => 'seat_number', 'label' => 'Seat Number'],
                     ['value' => 'flight_reason_id', 'label' => 'Reason'],
-
+                    ['value' => 'note', 'label' => 'Note'],
                     ['value' => 'aircraft.display_name_short', 'label' => 'Aircraft Full Name'],
                     ['value' => 'class_seat_combined', 'label' => 'Class/Seat Type/Seat Number Combined'],
                 ],

bootstrap/app.php

@@ -67,7 +67,7 @@ return Application::configure(basePath: dirname(__DIR__))
                     'message' => 'You don\'t have permission to access this page.',
                 ],
                 404 => [
-                    'title'   => 'You Flight Has Been Cancelled',
+                    'title'   => 'Your Flight Has Been Cancelled',
                     'message' => 'The page you are looking for doesn\'t exist or has been moved.',
                 ],
                 419 => [

database/migrations/2026_07_20_034908_add_aliiances_challenge.php

@@ -0,0 +1,58 @@
+<?php
+
+use App\Models\Achievement;
+use App\Models\AchievementCategory;
+use App\Models\AchievementDifficulty;
+use App\Models\User;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        $moderate = AchievementDifficulty::where('internal_name', 'moderate')->first();
+        $airlines_and_alliances = AchievementCategory::where('internal_name', 'airlines_and_alliances')->first();
+
+        Achievement::create([
+            'name' => 'Allied Forces',
+            'internal_name' => 'airlines_alliances.all_major_alliances',
+            'short_description' => 'Fly The 3 Major Airline Alliances (Skyteam, Star Alliance, Oneworld)',
+            'progressive' => true,
+            'difficulty_description' => 'For most people in most parts of the world this is quite achievable',
+            'threshold' => 3,
+            'achievement_category_id' => $airlines_and_alliances->id,
+            'achievement_difficulty_id' => $moderate->id,
+            'has_page' => true,
+            'sort_order' => 1,
+            'icon' => 'standard_achievement.png',
+            'long_description' => '',
+        ]);
+
+        Achievement::where('internal_name', 'airlines_alliances.cn3')->update(['sort_order' => 3]);
+        Achievement::where('internal_name', 'airlines_alliances.us3')->update(['sort_order' => 1]);
+        Achievement::where('internal_name', 'airlines_alliances.me3')->update(['sort_order' => 2]);
+        Achievement::where('internal_name', 'airlines_alliances.all_major_alliances')->update(['sort_order' => 4]);
+        Achievement::where('internal_name', 'airlines_alliances.all_skyteam')->update(['sort_order' => 5]);
+        Achievement::where('internal_name', 'airlines_alliances.all_oneworld')->update(['sort_order' => 6]);
+        Achievement::where('internal_name', 'airlines_alliances.all_star_alliance')->update(['sort_order' => 7]);
+        Achievement::where('internal_name', 'airlines_alliances.all_vanilla_alliance')->update(['sort_order' => 8]);
+
+
+        foreach(User::all() as $user){
+            $user->calculateAchievements();
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        //
+    }
+};

database/migrations/2026_08_11_100455_add_london_achievement.php

@@ -0,0 +1,87 @@
+<?php
+
+use App\Models\Achievement;
+use App\Models\AchievementCategory;
+use App\Models\AchievementDifficulty;
+use App\Models\User;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        $hard = AchievementDifficulty::where('internal_name', 'hard')->first();
+        $near_impossible = AchievementDifficulty::where('internal_name', 'near_impossible')->first();
+        $fun_challenges = AchievementCategory::where('internal_name', 'fun_challenges')->first();
+
+        Achievement::create([
+            'name' => 'London Calling',
+            'internal_name' => 'fun_challenges.all_london_airports',
+            'short_description' => 'Fly to all official London airports',
+            'progressive' => true,
+            'difficulty_description' => 'Much more achievable if you live in London!',
+            'threshold' => 6,
+            'achievement_category_id' => $fun_challenges->id,
+            'achievement_difficulty_id' => $hard->id,
+            'has_page' => true,
+            'sort_order' => 10,
+            'icon' => 'standard_achievement.png',
+            'long_description' => '',
+        ]);
+
+        $distance = AchievementCategory::create([
+            'name' => 'Distance',
+            'internal_name' => 'distance',
+            'description' => 'Achievements that are based on distance'
+        ]);
+
+        Achievement::create([
+            'name' => 'Million Miler',
+            'internal_name' => 'distance.million_miles',
+            'short_description' => 'Fly one million miles',
+            'progressive' => true,
+            'threshold' => 1609344,
+            'achievement_category_id' => $distance->id,
+            'achievement_difficulty_id' => $near_impossible->id,
+            'has_page' => false,
+            'sort_order' => 4,
+            'icon' => 'standard_achievement.png',
+            'long_description' => '',
+        ]);
+
+        Achievement::whereInternalName('general_flying.gigametre')->update([
+            'internal_name' => 'distance.gigametre',
+            'achievement_category_id' => $distance->id,
+            'sort_order' => 3
+        ]);
+
+        Achievement::whereInternalName('general_flying.circumference_of_the_earth')->update([
+            'internal_name' => 'distance.circumference_of_the_earth',
+            'achievement_category_id' => $distance->id,
+            'sort_order' => 1
+        ]);
+
+        Achievement::whereInternalName('general_flying.to_the_moon')->update([
+            'internal_name' => 'distance.to_the_moon',
+            'achievement_category_id' => $distance->id,
+            'sort_order' => 2
+        ]);
+
+        foreach(User::all() as $user){
+            $user->calculateAchievements();
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        //
+    }
+};

database/migrations/2026_08_21_122451_add_ignore_user_flight_airlines.php

@@ -0,0 +1,26 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::create('user_flights_ignore_missing_airlines', function (Blueprint $table) {
+            $table->id();
+            $table->foreignId('user_flight_id')
+                ->constrained('user_flights')
+                ->cascadeOnDelete();
+            $table->timestamps();
+
+            $table->unique('user_flight_id');
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::dropIfExists('user_flights_ignore_missing_airlines');
+    }
+};

database/migrations/2026_08_21_131434_add_achievement_category.php

@@ -0,0 +1,57 @@
+<?php
+
+use App\Models\Achievement;
+use App\Models\AchievementCategory;
+use Illuminate\Database\Migrations\Migration;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        $newCategory = AchievementCategory::create([
+            'internal_name' => 'number_of_flights',
+            'name'          => 'Number of Flights',
+            'description'   => 'Achievements for reaching flight count milestones.',
+        ]);
+
+        $achievementsToUpdate = [
+            'general_flying.first_flight',
+            'general_flying.10_flights',
+            'general_flying.500_flights',
+            'general_flying.50_flights',
+            'general_flying.100_flights',
+            'general_flying.1000_flights',
+        ];
+
+        foreach ($achievementsToUpdate as $internalName) {
+            $achievement = Achievement::where('internal_name', $internalName)->first();
+
+            if (!$achievement) {
+                continue; // or throw, depending how strict you want this
+            }
+
+            $achievement->update([
+                'achievement_category_id' => $newCategory->id,
+                'internal_name' => str_replace('general_flying.', 'number_of_flights.', $internalName),
+            ]);
+        }
+    }
+
+    public function down(): void
+    {
+        $oldCategory = AchievementCategory::where('internal_name', 'general_flying')->first();
+
+        if ($oldCategory) {
+            Achievement::where('internal_name', 'like', 'number_of_flights.%')
+                ->get()
+                ->each(function (Achievement $achievement) use ($oldCategory) {
+                    $achievement->update([
+                        'achievement_category_id' => $oldCategory->id,
+                        'internal_name' => str_replace('number_of_flights.', 'general_flying.', $achievement->internal_name),
+                    ]);
+                });
+        }
+
+        AchievementCategory::where('internal_name', 'number_of_flights')->delete();
+    }
+};

resources/js/Components/Admin/MissingAirlineCard.vue

@@ -1,25 +1,63 @@
 <script setup lang="ts">
+import { ref, computed } from "vue"
+import axios from "axios"
 import { MissingAirline } from "@/Types/types"
 
-defineProps<{
+const props = defineProps<{
     airline: MissingAirline
 }>()
+
+// Track ids we've dismissed locally (optimistic UI) and ones currently in-flight
+const dismissedIds = ref<Set<number>>(new Set())
+const pendingIds = ref<Set<number>>(new Set())
+
+const visibleFlights = computed(() =>
+    props.airline.flights.filter(flight => !dismissedIds.value.has(flight.id))
+)
+
+async function dismissFlight(flightId: number) {
+    if (pendingIds.value.has(flightId)) return
+
+    pendingIds.value.add(flightId)
+    // Optimistically remove the pill
+    dismissedIds.value.add(flightId)
+
+    try {
+        await axios.post('/admin/ignore-missing-airline', {
+            flight_id: flightId,
+        })
+    } catch (error) {
+        // Revert on failure so the flight isn't silently lost from view
+        dismissedIds.value.delete(flightId)
+        console.error('Failed to ignore missing airline for flight', flightId, error)
+    } finally {
+        pendingIds.value.delete(flightId)
+    }
+}
 </script>
 
 <template>
     <div class="missing-airline-card">
         <div class="card-header">
             <span class="airline-code">{{ airline.code }}</span>
-            <span class="flight-count">{{ airline.flights.length }} flight{{ airline.flights.length === 1 ? '' : 's' }}</span>
+            <span class="flight-count">{{ visibleFlights.length }} flight{{ visibleFlights.length === 1 ? '' : 's' }}</span>
         </div>
 
-        <ul class="flight-list">
+        <div class="flight-list">
-            <li v-for="flight in airline.flights" :key="flight.link" class="flight-item">
+            <v-chip
-                <a :href="flight.link" class="flight-link" target="_blank" rel="noopener">
+                v-for="flight in visibleFlights"
+                :key="flight.link"
+                class="flight-chip"
+                size="small"
+                closable
+                :disabled="pendingIds.has(flight.id)"
+                @click:close="dismissFlight(flight.id)"
+            >
+                <a :href="flight.link" class="flight-link" target="_blank" rel="noopener" @click.stop>
                     {{ flight.flight_number }}
                 </a>
-            </li>
+            </v-chip>
-        </ul>
+        </div>
     </div>
 </template>
 
@@ -62,30 +100,23 @@ defineProps<{
     display: flex;
     flex-wrap: wrap;
     gap: 0.5rem;
-    list-style: none;
-    padding: 0;
-    margin: 0;
 }
 
-.flight-item {
+.flight-chip {
-    display: flex;
-}
-
-.flight-link {
     font-family: 'Share Tech Mono', monospace;
     font-size: 0.72rem;
     letter-spacing: 0.06em;
+    background: rgba(255, 255, 255, 0.04) !important;
+    border: 1px solid rgba(255, 255, 255, 0.06);
+}
+
+.flight-link {
     color: #9fb3c8;
     text-decoration: none;
-    background: rgba(255, 255, 255, 0.04);
+    transition: color 0.15s ease;
-    border: 1px solid rgba(255, 255, 255, 0.06);
-    border-radius: 4px;
-    padding: 0.25rem 0.5rem;
-    transition: color 0.15s ease, border-color 0.15s ease;
 }
 
 .flight-link:hover {
     color: #ffc107;
-    border-color: rgba(255, 193, 7, 0.4);
 }
 </style>

resources/js/Components/FlightsGoneBy/Charts/ChartTypes/DonutChart.vue

@@ -250,7 +250,7 @@ const legendItems = computed(() => {
 
             <div v-if="mode === 'all'" class="ring-labels">
                 <span v-for="(r, i) in normalizedRings" :key="r.name">
-                    &#9899; {{ i === 0 ? 'Outer' : i === normalizedRings.length - 1 ? 'Inner' : `Ring ${i + 1}` }}
+                    {{ i === 0 ? 'Outer' : i === normalizedRings.length - 1 ? 'Inner' : `Ring ${i + 1}` }}
                     Ring = {{ r.name }}
                 </span>
             </div>

resources/js/Components/FlightsGoneBy/Charts/FlightTypeChart.vue

@@ -7,10 +7,9 @@ const props = defineProps<{
 </script>
 <template>
     <DonutChart
-        title="Flight Scopes"
+        title="Flight Scope"
         :height="280"
-        center-mode="count"
+        total-label="Flights"
-        total-label="Flight Scopes"
         :labels="flightStats.flightTypes.value.labels"
         :series="flightStats.flightTypes.value.series"
     />

resources/js/Components/FlightsGoneBy/CopyPageButton.vue

@@ -0,0 +1,55 @@
+<template>
+    <v-btn
+        :color="copied ? 'success' : color"
+        :variant="variant"
+        :icon="iconOnly"
+        :size="iconOnly ? 'x-small' : 'default'"
+        @click="handleCopy"
+    >
+        <v-icon :start="!iconOnly" :icon="copied ? 'mdi-check' : 'mdi-content-copy'" />
+        <template v-if="!iconOnly">{{ copied ? 'Copied Link To Page!' : label }}</template>
+        <v-tooltip v-if="iconOnly" activator="parent" location="top">
+            {{ copied ? 'Copied Link To Page!' : label }}
+        </v-tooltip>
+    </v-btn>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue';
+import { useDisplay } from 'vuetify';
+import { copyToClipboard } from '@/Composables/useClipboard';
+
+interface Props {
+    label?: string;
+    color?: string;
+    variant?: 'flat' | 'text' | 'elevated' | 'tonal' | 'outlined' | 'plain';
+    resetDelay?: number;
+}
+
+const props = withDefaults(defineProps<Props>(), {
+    label: 'Copy link',
+    color: 'primary',
+    variant: 'outlined',
+    resetDelay: 2000,
+});
+
+const { mobile } = useDisplay();
+const iconOnly = mobile;
+
+const copied = ref(false);
+let resetTimeout: ReturnType<typeof setTimeout> | null = null;
+
+async function handleCopy() {
+    try {
+        await copyToClipboard(window.location.href);
+        copied.value = true;
+
+        if (resetTimeout) clearTimeout(resetTimeout);
+        resetTimeout = setTimeout(() => {
+            copied.value = false;
+        }, props.resetDelay);
+    } catch (err) {
+        console.error('Failed to copy URL:', err);
+    }
+}
+</script>

resources/js/Components/FlightsGoneBy/DepartureBoard.vue

@@ -17,7 +17,7 @@ const props = defineProps<{
 const page = usePage<SharedProps>().props
 const ITEMS_PER_PAGE = 25
 
-const defaultColumns = ['airline', 'flight_number', 'departure_airport', 'arrival_airport', 'departure_date', 'departure_time', 'arrival_time', 'duration', 'distance', 'aircraft', 'registration', 'class_seat_combined']
+const defaultColumns = ['airline', 'flight_number', 'departure_airport', 'arrival_airport', 'departure_date', 'departure_time', 'arrival_time', 'duration', 'distance', 'aircraft', 'registration', 'class_seat_combined', 'note']
 const columnsToShow = computed(() => page.auth.user?.resolved_settings?.departure_board_columns ?? defaultColumns)
 const showColumn = (column: string) => columnsToShow.value.includes(column)
 
@@ -44,6 +44,7 @@ const allHeaders = [
     { title: 'SEAT TYPE', key: 'seat_type_id', sortable: true },
     { title: 'SEAT NO.', key: 'seat_number', sortable: true },
     { title: 'REASON', key: 'flight_reason_id', sortable: true },
+    { title: 'NOTE', key: 'note', sortable: true },
     { title: '', key: 'actions', sortable: false },
 ]
 

resources/js/Components/FlightsGoneBy/DepartureBoardTableRow.vue

@@ -41,7 +41,7 @@ const reasonBadgeVariant = (reason: string) => {
 }
 
 const showColumn = (column: string) => props.columnsToShow.includes(column)
-
+console.log(props.columnsToShow)
 </script>
 
 <template>
@@ -170,6 +170,10 @@ const showColumn = (column: string) => props.columnsToShow.includes(column)
             </span>
         </td>
 
+        <td v-if="showColumn('note')" class="v-data-table__td note-cell">
+            <span v-if="flight.note" class="note-text">{{ flight.note }}</span>
+        </td>
+
         <td class="v-data-table__td actions-cell">
             <UserFlightContextMenu :profile-user="user" :can-edit="canEdit" :flight="flight" />
         </td>
@@ -184,6 +188,17 @@ const showColumn = (column: string) => props.columnsToShow.includes(column)
     padding-right: 0 !important;
 }
 
+.note-cell {
+    min-width: 200px;
+    max-width: 320px;
+}
+
+.note-text {
+    display: block;
+    overflow: hidden;
+    font-size: 0.85rem;
+}
+
 .city-name{
     color: #556;
     text-transform: uppercase;
@@ -211,23 +226,14 @@ const showColumn = (column: string) => props.columnsToShow.includes(column)
     align-items: center;
     vertical-align: middle;
     gap: 0.5rem;
-    overflow-x: auto;
+    width: fit-content;
-    max-width: 160px;
-    /* Hide scrollbar but keep functionality */
-    scrollbar-width: none;
-    &::-webkit-scrollbar { display: none; }
 }
 
 .iata {
     font-weight: 600;
 }
 
-.class-cell {
+
-    display: flex;
-    align-items: center;
-    vertical-align: middle;
-    gap: 0.5rem;
-}
 
 .actions-cell {
     width: 40px;
@@ -277,15 +283,5 @@ const showColumn = (column: string) => props.columnsToShow.includes(column)
         padding: 0 !important;
     }
 
-    .class-badges-cell {
-        max-width: 140px;
-        overflow: hidden;
-    }
-
-    .class-cell > *:not(:first-child) {
-        display: none;
-    }
-
-
 }
 </style>

resources/js/Components/FlightsGoneBy/FlightFilter.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { Airline, Alliance, Flight, RegionRange, FlightRange, FlightScope } from '@/Types/types'
-import { ref, watch } from 'vue'
+import { reactive, ref, watch, onMounted, nextTick } from 'vue'
 import AllianceLogo from "@/Components/FlightsGoneBy/AllianceLogo.vue"
 
 const props = defineProps<{
@@ -23,11 +23,63 @@ const emit = defineEmits<{
         seatTypes: number[]
         manufacturers: string[]
         aircraftModels: number[]
+        engineTypes: string[]
+        engineCounts: number[]
         airportRegions: number[]
         otherUsers: string[]
     }]
 }>()
 
+// ── Filter registry ──────────────────────────────────────────────────────────
+//
+// This is the single source of truth for every filter's identity. To add a
+// new filter:
+//   1. Add one entry here (name = the key used in `filters` + the URL param,
+//      emitKey = the key expected by the `change` event, kind = how to parse
+//      values coming back out of the URL).
+//   2. Add a <v-select> in the template with :name="'yourName'" and
+//      v-model="filters.yourName" (initialise it in `filters` below, or just
+//      let step 1 do it for you since `filters` is derived from this list).
+//
+// Nothing else needs to know about the new filter — URL loading, URL syncing,
+// and the emitted payload are all generic over this list.
+
+type FilterKind = 'number' | 'string'
+
+interface FilterDef {
+    name: string       // key in `filters`, and the URL query param name
+    emitKey: string     // key in the payload sent via the `change` event
+    kind: FilterKind    // how to coerce values parsed back out of the URL
+}
+
+const FILTER_DEFS: FilterDef[] = [
+    { name: 'year',          emitKey: 'years',          kind: 'number' },
+    { name: 'airline',       emitKey: 'airlines',       kind: 'number' },
+    { name: 'alliance',      emitKey: 'alliances',      kind: 'number' },
+    { name: 'country',       emitKey: 'countries',      kind: 'string' },
+    { name: 'continent',     emitKey: 'continents',     kind: 'string' },
+    { name: 'flightClass',   emitKey: 'flightClasses',  kind: 'number' },
+    { name: 'crewType',      emitKey: 'crewTypes',      kind: 'number' },
+    { name: 'flightScope',   emitKey: 'flightScopes',   kind: 'string' },
+    { name: 'flightRange',   emitKey: 'flightRanges',   kind: 'string' },
+    { name: 'regionRange',   emitKey: 'regionRanges',   kind: 'string' },
+    { name: 'flightReason',  emitKey: 'flightReasons',  kind: 'number' },
+    { name: 'seatType',      emitKey: 'seatTypes',      kind: 'number' },
+    { name: 'manufacturer',  emitKey: 'manufacturers',  kind: 'string' },
+    { name: 'aircraftModel', emitKey: 'aircraftModels', kind: 'number' },
+    { name: 'engineType',    emitKey: 'engineTypes',    kind: 'string' },
+    { name: 'engineCount',   emitKey: 'engineCounts',   kind: 'number' },
+    { name: 'airportRegion', emitKey: 'airportRegions', kind: 'number' },
+    { name: 'otherUsers',    emitKey: 'otherUsers',     kind: 'string' },
+]
+
+// Single reactive bag of filter state, one array per FILTER_DEFS entry.
+// `filters.year`, `filters.airline`, etc. This is what every v-select
+// v-models against.
+const filters = reactive<Record<string, any[]>>(
+    Object.fromEntries(FILTER_DEFS.map(d => [d.name, []])),
+)
+
 // ── Available options ─────────────────────────────────────────────────────────
 
 type AirlineData = { id: number; name: string; airline: Airline }
@@ -62,6 +114,8 @@ function buildOptions(flights: Flight[]) {
     const regionRanges   = new Set<RegionRange>()
     const manufacturers  = new Map<string, { name: string }>()
     const aircraftModels = new Map<number, { id: number; name: string }>()
+    const engineTypes    = new Map<string, { name: string }>()
+    const engineCounts   = new Map<number, { count: number }>()
     const airportRegions = new Map<number, { id: number; name: string; countryCodes: Set<string> }>()
     const otherUsers = new Set<string>()
 
@@ -120,6 +174,12 @@ function buildOptions(flights: Flight[]) {
         if (f.aircraft?.id != null && f.aircraft?.display_name_short)
             aircraftModels.set(f.aircraft.id, { id: f.aircraft.id, name: f.aircraft.display_name_short })
 
+        if (f.aircraft?.engine_type)
+            engineTypes.set(f.aircraft.engine_type, { name: f.aircraft.engine_type })
+
+        if (f.aircraft?.engine_count != null)
+            engineCounts.set(f.aircraft.engine_count, { count: f.aircraft.engine_count })
+
         flightScopes.add(f.scope)
         flightRanges.add(f.range)
         regionRanges.add(f.region_range)
@@ -144,6 +204,8 @@ function buildOptions(flights: Flight[]) {
         regionRanges:   regionRangeOrder.filter(r => regionRanges.has(r)).map(r => ({ value: r, label: REGION_RANGE_LABELS[r] })),
         manufacturers:  [...manufacturers.values()].sort((a, b) => a.name.localeCompare(b.name)),
         aircraftModels: [...aircraftModels.values()].sort((a, b) => a.name.localeCompare(b.name)),
+        engineTypes:    [...engineTypes.values()].sort((a, b) => a.name.localeCompare(b.name)),
+        engineCounts:   [...engineCounts.values()].sort((a, b) => a.count - b.count),
         airportRegions: [...airportRegions.values()].sort((a, b) => a.name.localeCompare(b.name)),
         otherUsers: [...otherUsers].sort((a, b) => a.localeCompare(b)),
     }
@@ -151,57 +213,64 @@ function buildOptions(flights: Flight[]) {
 
 const availableOptions = buildOptions(props.flights)
 
-// ── Filter state ──────────────────────────────────────────────────────────────
+// ── URL query sync ──────────────────────────────────────────────────────────
 
-const selectedYears          = ref<number[]>([])
+function loadFiltersFromQuery(): boolean {
-const selectedAirlines       = ref<number[]>([])
+    const params = new URLSearchParams(window.location.search)
-const selectedAlliances      = ref<number[]>([])
+    let foundAny = false
-const selectedCountries      = ref<string[]>([])
+    for (const def of FILTER_DEFS) {
-const selectedContinents     = ref<string[]>([])
+        const raw = params.get(def.name)
-const selectedFlightClasses  = ref<number[]>([])
+        if (!raw) continue
-const selectedCrewTypes      = ref<number[]>([])
+        const values = raw.split(',').filter(Boolean)
-const selectedFlightScopes   = ref<FlightScope[]>([])
+        filters[def.name] = def.kind === 'number'
-const selectedFlightRanges   = ref<FlightRange[]>([])
+            ? values.map(Number).filter(n => !Number.isNaN(n))
-const selectedRegionRanges   = ref<RegionRange[]>([])
+            : values
-const selectedFlightReasons  = ref<number[]>([])
+        foundAny = true
-const selectedSeatTypes      = ref<number[]>([])
+    }
-const selectedManufacturers  = ref<string[]>([])
+    return foundAny
-const selectedAircraftModels = ref<number[]>([])
+}
-const selectedAirportRegions = ref<number[]>([])
-const selectedOtherUsers = ref<string[]>([])
 
-// When selected countries change, drop any selected regions that no longer
+function syncUrlWithFilters() {
-// belong to any of the selected countries.
+    const params = new URLSearchParams()
-watch(selectedCountries, (countries) => {
+    for (const def of FILTER_DEFS) {
-    if (countries.length === 0) return
+        const value = filters[def.name]
-    selectedAirportRegions.value = selectedAirportRegions.value.filter(regionId => {
+        if (value.length > 0)
-        const region = availableOptions.airportRegions.find(r => r.id === regionId)
+            params.set(def.name, value.join(','))
-        if (!region) return false
+    }
-        return [...(region as any).countryCodes].some((code: string) => countries.includes(code))
+    const query = params.toString()
-    })
+    const newUrl = `${window.location.pathname}${query ? `?${query}` : ''}`
-})
+    window.history.replaceState(window.history.state, '', newUrl)
+}
+
+// ── Emit ──────────────────────────────────────────────────────────────────────
 
 function emitFilters() {
-    emit('change', {
+    syncUrlWithFilters()
-        years:          selectedYears.value,
+    const payload = Object.fromEntries(
-        airlines:       selectedAirlines.value,
+        FILTER_DEFS.map(def => [def.emitKey, filters[def.name]]),
-        alliances:      selectedAlliances.value,
+    )
-        countries:      selectedCountries.value,
+    emit('change', payload as Parameters<typeof emit>[1] extends [infer T] ? T : never)
-        continents:     selectedContinents.value,
-        flightClasses:  selectedFlightClasses.value,
-        crewTypes:      selectedCrewTypes.value,
-        flightScopes:   selectedFlightScopes.value,
-        flightRanges:   selectedFlightRanges.value,
-        regionRanges:   selectedRegionRanges.value,
-        flightReasons:  selectedFlightReasons.value,
-        seatTypes:      selectedSeatTypes.value,
-        manufacturers:  selectedManufacturers.value,
-        aircraftModels: selectedAircraftModels.value,
-        airportRegions: selectedAirportRegions.value,
-        otherUsers: selectedOtherUsers.value,
-    })
 }
 
+onMounted(async () => {
+    const hasQueryFilters = loadFiltersFromQuery()
+
+    // Only emit if the URL actually seeded some filters - a plain page load
+    // (no query params) should behave exactly like before and not emit at all,
+    // since the parent already renders its own initial, unfiltered state.
+    if (!hasQueryFilters) return
+
+    // Wait a beat before emitting. Charts further down the tree (ApexCharts,
+    // in particular) initialize asynchronously on their own mount; firing our
+    // update in the same synchronous pass can hand them new series data before
+    // their internal chart instance exists yet, which throws inside the
+    // charting library. A couple of ticks is enough to let that settle.
+    await nextTick()
+    await nextTick()
+    emitFilters()
+})
+
+
 // ── Helpers ───────────────────────────────────────────────────────────────────
 
 const countryFlagClass = (code: string) =>
@@ -209,326 +278,384 @@ const countryFlagClass = (code: string) =>
 </script>
 
 <template>
-    <div class="flight-filters">
+    <div class="flight-filters-wrapper">
+        <div class="flight-filters">
 
-        <v-select
+            <v-select
-            v-model="selectedYears"
+                name="year"
-            :items="availableOptions.years"
+                v-model="filters.year"
-            label="Year"
+                :items="availableOptions.years"
-            multiple clearable hide-details
+                label="Year"
-            density="compact" variant="outlined"
+                multiple clearable hide-details
-            @update:model-value="emitFilters"
+                density="compact" variant="outlined"
-        >
+                @update:model-value="emitFilters"
-            <template #selection="{ item, index }">
+            >
-                <span v-if="index < 2" class="v-select__selection-text">
+                <template #selection="{ item, index }">
-                    {{ item }}<span v-if="index < Math.min(selectedYears.length, 2) - 1">,&nbsp;</span>
+                    <span v-if="index < 2" class="v-select__selection-text">
-                </span>
+                        {{ item }}<span v-if="index < Math.min(filters.year.length, 2) - 1">,&nbsp;</span>
-                <span v-if="index === 2" class="text-caption text-medium-emphasis">+{{ selectedYears.length - 2 }}</span>
+                    </span>
-            </template>
+                    <span v-if="index === 2" class="text-caption text-medium-emphasis">+{{ filters.year.length - 2 }}</span>
-        </v-select>
+                </template>
+            </v-select>
 
-        <v-select
+            <v-select
-            v-model="selectedAirlines"
+                name="airline"
-            :items="availableOptions.airlines"
+                v-model="filters.airline"
-            item-title="name" item-value="id"
+                :items="availableOptions.airlines"
-            label="Airline"
+                item-title="name" item-value="id"
-            multiple clearable hide-details
+                label="Airline"
-            density="compact" variant="outlined"
+                multiple clearable hide-details
-            @update:model-value="emitFilters"
+                density="compact" variant="outlined"
-        >
+                @update:model-value="emitFilters"
-            <template #item="{ item, props: itemProps }">
+            >
-                <v-list-item v-bind="itemProps">
+                <template #item="{ item, props: itemProps }">
-                    <template #prepend="{ isSelected }">
+                    <v-list-item v-bind="itemProps">
-                        <v-checkbox-btn :model-value="isSelected" tabindex="-1" />
+                        <template #prepend="{ isSelected }">
-                    </template>
+                            <v-checkbox-btn :model-value="isSelected" tabindex="-1" />
-                    <template #title>
+                        </template>
-                        <img
+                        <template #title>
-                            :src="(item as AirlineData).airline.logo_url"
+                            <img
-                            width="32" height="32"
+                                :src="(item as AirlineData).airline.logo_url"
-                            style="object-fit: contain; margin-right: 8px; vertical-align: middle;"
+                                width="32" height="32"
-                            alt=""
+                                style="object-fit: contain; margin-right: 8px; vertical-align: middle;"
-                        />
+                                alt=""
-                        {{ (item as any).name }}
+                            />
-                    </template>
+                            {{ (item as any).name }}
-                </v-list-item>
+                        </template>
-            </template>
+                    </v-list-item>
-            <template #selection="{ item, index }">
+                </template>
-                <span v-if="index < 2" class="v-select__selection-text">
+                <template #selection="{ item, index }">
-                    {{ (item as any).name }}<span v-if="index < Math.min(selectedAirlines.length, 2) - 1">,&nbsp;</span>
+                    <span v-if="index < 2" class="v-select__selection-text">
-                </span>
+                        {{ (item as any).name }}<span v-if="index < Math.min(filters.airline.length, 2) - 1">,&nbsp;</span>
-                <span v-if="index === 2" class="text-caption text-medium-emphasis">+{{ selectedAirlines.length - 2 }}</span>
+                    </span>
-            </template>
+                    <span v-if="index === 2" class="text-caption text-medium-emphasis">+{{ filters.airline.length - 2 }}</span>
-        </v-select>
+                </template>
+            </v-select>
 
-        <v-select
+            <v-select
-            v-if="availableOptions.alliances.length > 0"
+                v-if="availableOptions.alliances.length > 0"
-            v-model="selectedAlliances"
+                name="alliance"
-            :items="availableOptions.alliances"
+                v-model="filters.alliance"
-            item-title="name" item-value="id"
+                :items="availableOptions.alliances"
-            label="Alliance"
+                item-title="name" item-value="id"
-            multiple clearable hide-details
+                label="Alliance"
-            density="compact" variant="outlined"
+                multiple clearable hide-details
-            @update:model-value="emitFilters"
+                density="compact" variant="outlined"
-        >
+                @update:model-value="emitFilters"
-            <template #item="{ item, props: itemProps }">
+            >
-                <v-list-item v-bind="itemProps">
+                <template #item="{ item, props: itemProps }">
-                    <template #prepend="{ isSelected }">
+                    <v-list-item v-bind="itemProps">
-                        <v-checkbox-btn :model-value="isSelected" tabindex="-1" />
+                        <template #prepend="{ isSelected }">
-                    </template>
+                            <v-checkbox-btn :model-value="isSelected" tabindex="-1" />
-                    <template #title>
+                        </template>
-                        <AllianceLogo :size="22" :alliance="(item as any).alliance" style="margin-right: 8px;" />
+                        <template #title>
-                        {{ (item as any).name }}
+                            <AllianceLogo :size="22" :alliance="(item as any).alliance" style="margin-right: 8px;" />
-                    </template>
+                            {{ (item as any).name }}
-                </v-list-item>
+                        </template>
-            </template>
+                    </v-list-item>
-            <template #selection="{ item, index }">
+                </template>
-                <span v-if="index < 2" class="v-select__selection-text">
+                <template #selection="{ item, index }">
-                    {{ (item as any).name }}<span v-if="index < Math.min(selectedAlliances.length, 2) - 1">,&nbsp;</span>
+                    <span v-if="index < 2" class="v-select__selection-text">
-                </span>
+                        {{ (item as any).name }}<span v-if="index < Math.min(filters.alliance.length, 2) - 1">,&nbsp;</span>
-                <span v-if="index === 2" class="text-caption text-medium-emphasis">+{{ selectedAlliances.length - 2 }}</span>
+                    </span>
-            </template>
+                    <span v-if="index === 2" class="text-caption text-medium-emphasis">+{{ filters.alliance.length - 2 }}</span>
-        </v-select>
+                </template>
+            </v-select>
 
-        <v-select
+            <v-select
-            v-model="selectedCountries"
+                name="country"
-            :items="availableOptions.countries"
+                v-model="filters.country"
-            item-title="name" item-value="code"
+                :items="availableOptions.countries"
-            label="Country"
+                item-title="name" item-value="code"
-            multiple clearable hide-details
+                label="Country"
-            density="compact" variant="outlined"
+                multiple clearable hide-details
-            @update:model-value="emitFilters"
+                density="compact" variant="outlined"
-        >
+                @update:model-value="emitFilters"
-            <template #item="{ item, props: itemProps }">
+            >
-                <v-list-item v-bind="itemProps">
+                <template #item="{ item, props: itemProps }">
-                    <template #prepend="{ isSelected }">
+                    <v-list-item v-bind="itemProps">
-                        <v-checkbox-btn :model-value="isSelected" tabindex="-1" />
+                        <template #prepend="{ isSelected }">
-                    </template>
+                            <v-checkbox-btn :model-value="isSelected" tabindex="-1" />
-                    <template #title>
+                        </template>
-                        <span :class="countryFlagClass((item as any).code)" style="margin-right: 8px; font-size: 1.1em;" />
+                        <template #title>
-                        {{ (item as any).name }}
+                            <span :class="countryFlagClass((item as any).code)" style="margin-right: 8px; font-size: 1.1em;" />
-                    </template>
+                            {{ (item as any).name }}
-                </v-list-item>
+                        </template>
-            </template>
+                    </v-list-item>
-            <template #selection="{ item, index }">
+                </template>
-                <span v-if="index < 2" class="v-select__selection-text">
+                <template #selection="{ item, index }">
-                    <span :class="countryFlagClass((item as any).code)" style="margin-right: 4px;" />
+                    <span v-if="index < 2" class="v-select__selection-text">
-                    {{ (item as any).name }}<span v-if="index < Math.min(selectedCountries.length, 2) - 1">,&nbsp;</span>
+                        <span :class="countryFlagClass((item as any).code)" style="margin-right: 4px;" />
-                </span>
+                        {{ (item as any).name }}<span v-if="index < Math.min(filters.country.length, 2) - 1">,&nbsp;</span>
-                <span v-if="index === 2" class="text-caption text-medium-emphasis">+{{ selectedCountries.length - 2 }}</span>
+                    </span>
-            </template>
+                    <span v-if="index === 2" class="text-caption text-medium-emphasis">+{{ filters.country.length - 2 }}</span>
-        </v-select>
+                </template>
+            </v-select>
 
-        <v-select
+            <v-select
-            v-if="availableOptions.flightScopes.length > 1"
+                v-if="availableOptions.flightScopes.length > 1"
-            v-model="selectedFlightScopes"
+                name="flightScope"
-            :items="availableOptions.flightScopes"
+                v-model="filters.flightScope"
-            item-title="label" item-value="value"
+                :items="availableOptions.flightScopes"
-            label="Flight Scope"
+                item-title="label" item-value="value"
-            multiple clearable hide-details
+                label="Flight Scope"
-            density="compact" variant="outlined"
+                multiple clearable hide-details
-            @update:model-value="emitFilters"
+                density="compact" variant="outlined"
-        >
+                @update:model-value="emitFilters"
-            <template #selection="{ item, index }">
+            >
-                <span v-if="index < 2" class="v-select__selection-text">
+                <template #selection="{ item, index }">
-                    {{ (item as any).label }}<span v-if="index < Math.min(selectedFlightScopes.length, 2) - 1">,&nbsp;</span>
+                    <span v-if="index < 2" class="v-select__selection-text">
-                </span>
+                        {{ (item as any).label }}<span v-if="index < Math.min(filters.flightScope.length, 2) - 1">,&nbsp;</span>
-                <span v-if="index === 2" class="text-caption text-medium-emphasis">+{{ selectedFlightScopes.length - 2 }}</span>
+                    </span>
-            </template>
+                    <span v-if="index === 2" class="text-caption text-medium-emphasis">+{{ filters.flightScope.length - 2 }}</span>
-        </v-select>
+                </template>
+            </v-select>
 
-        <v-select
+            <v-select
-            v-if="availableOptions.airportRegions.length > 0"
+                v-if="availableOptions.airportRegions.length > 0"
-            v-model="selectedAirportRegions"
+                name="airportRegion"
-            :items="availableOptions.airportRegions"
+                v-model="filters.airportRegion"
-            item-title="name" item-value="id"
+                :items="availableOptions.airportRegions"
-            label="Region"
+                item-title="name" item-value="id"
-            multiple clearable hide-details
+                label="Region"
-            density="compact" variant="outlined"
+                multiple clearable hide-details
-            @update:model-value="emitFilters"
+                density="compact" variant="outlined"
-        >
+                @update:model-value="emitFilters"
-            <template #selection="{ item, index }">
+            >
-                <span v-if="index < 2" class="v-select__selection-text">
+                <template #selection="{ item, index }">
-                    {{ (item as any).name }}<span v-if="index < Math.min(selectedAirportRegions.length, 2) - 1">,&nbsp;</span>
+                    <span v-if="index < 2" class="v-select__selection-text">
-                </span>
+                        {{ (item as any).name }}<span v-if="index < Math.min(filters.airportRegion.length, 2) - 1">,&nbsp;</span>
-                <span v-if="index === 2" class="text-caption text-medium-emphasis">+{{ selectedAirportRegions.length - 2 }}</span>
+                    </span>
-            </template>
+                    <span v-if="index === 2" class="text-caption text-medium-emphasis">+{{ filters.airportRegion.length - 2 }}</span>
-        </v-select>
+                </template>
+            </v-select>
 
-        <v-select
+            <v-select
-            v-if="availableOptions.regionRanges.length > 1"
+                v-if="availableOptions.regionRanges.length > 1"
-            v-model="selectedRegionRanges"
+                name="regionRange"
-            :items="availableOptions.regionRanges"
+                v-model="filters.regionRange"
-            item-title="label" item-value="value"
+                :items="availableOptions.regionRanges"
-            label="Region Range"
+                item-title="label" item-value="value"
-            multiple clearable hide-details
+                label="Region Range"
-            density="compact" variant="outlined"
+                multiple clearable hide-details
-            @update:model-value="emitFilters"
+                density="compact" variant="outlined"
-        >
+                @update:model-value="emitFilters"
-            <template #selection="{ item, index }">
+            >
-                <span v-if="index < 2" class="v-select__selection-text">
+                <template #selection="{ item, index }">
-                    {{ (item as any).label }}<span v-if="index < Math.min(selectedRegionRanges.length, 2) - 1">,&nbsp;</span>
+                    <span v-if="index < 2" class="v-select__selection-text">
-                </span>
+                        {{ (item as any).label }}<span v-if="index < Math.min(filters.regionRange.length, 2) - 1">,&nbsp;</span>
-                <span v-if="index === 2" class="text-caption text-medium-emphasis">+{{ selectedRegionRanges.length - 2 }}</span>
+                    </span>
-            </template>
+                    <span v-if="index === 2" class="text-caption text-medium-emphasis">+{{ filters.regionRange.length - 2 }}</span>
-        </v-select>
+                </template>
+            </v-select>
 
-        <v-select
+            <v-select
-            v-model="selectedContinents"
+                name="continent"
-            :items="availableOptions.continents"
+                v-model="filters.continent"
-            item-title="name" item-value="code"
+                :items="availableOptions.continents"
-            label="Continent"
+                item-title="name" item-value="code"
-            multiple clearable hide-details
+                label="Continent"
-            density="compact" variant="outlined"
+                multiple clearable hide-details
-            @update:model-value="emitFilters"
+                density="compact" variant="outlined"
-        >
+                @update:model-value="emitFilters"
-            <template #selection="{ item, index }">
+            >
-                <span v-if="index < 2" class="v-select__selection-text">
+                <template #selection="{ item, index }">
-                    {{ (item as any).name }}<span v-if="index < Math.min(selectedContinents.length, 2) - 1">,&nbsp;</span>
+                    <span v-if="index < 2" class="v-select__selection-text">
-                </span>
+                        {{ (item as any).name }}<span v-if="index < Math.min(filters.continent.length, 2) - 1">,&nbsp;</span>
-                <span v-if="index === 2" class="text-caption text-medium-emphasis">+{{ selectedContinents.length - 2 }}</span>
+                    </span>
-            </template>
+                    <span v-if="index === 2" class="text-caption text-medium-emphasis">+{{ filters.continent.length - 2 }}</span>
-        </v-select>
+                </template>
+            </v-select>
 
-        <v-select
+            <v-select
-            v-if="availableOptions.flightRanges.length > 1"
+                v-if="availableOptions.flightRanges.length > 1"
-            v-model="selectedFlightRanges"
+                name="flightRange"
-            :items="availableOptions.flightRanges"
+                v-model="filters.flightRange"
-            item-title="label" item-value="value"
+                :items="availableOptions.flightRanges"
-            label="Flight Range"
+                item-title="label" item-value="value"
-            multiple clearable hide-details
+                label="Flight Range"
-            density="compact" variant="outlined"
+                multiple clearable hide-details
-            @update:model-value="emitFilters"
+                density="compact" variant="outlined"
-        >
+                @update:model-value="emitFilters"
-            <template #selection="{ item, index }">
+            >
-                <span v-if="index < 2" class="v-select__selection-text">
+                <template #selection="{ item, index }">
-                    {{ (item as any).label }}<span v-if="index < Math.min(selectedFlightRanges.length, 2) - 1">,&nbsp;</span>
+                    <span v-if="index < 2" class="v-select__selection-text">
-                </span>
+                        {{ (item as any).label }}<span v-if="index < Math.min(filters.flightRange.length, 2) - 1">,&nbsp;</span>
-                <span v-if="index === 2" class="text-caption text-medium-emphasis">+{{ selectedFlightRanges.length - 2 }}</span>
+                    </span>
-            </template>
+                    <span v-if="index === 2" class="text-caption text-medium-emphasis">+{{ filters.flightRange.length - 2 }}</span>
-        </v-select>
+                </template>
+            </v-select>
 
-        <v-select
+            <v-select
-            v-model="selectedFlightClasses"
+                name="flightClass"
-            :items="availableOptions.classes"
+                v-model="filters.flightClass"
-            item-title="name" item-value="id"
+                :items="availableOptions.classes"
-            label="Flight Class"
+                item-title="name" item-value="id"
-            multiple clearable hide-details
+                label="Flight Class"
-            density="compact" variant="outlined"
+                multiple clearable hide-details
-            @update:model-value="emitFilters"
+                density="compact" variant="outlined"
-        >
+                @update:model-value="emitFilters"
-            <template #selection="{ item, index }">
+            >
-                <span v-if="index < 2" class="v-select__selection-text">
+                <template #selection="{ item, index }">
-                    {{ (item as any).name }}<span v-if="index < Math.min(selectedFlightClasses.length, 2) - 1">,&nbsp;</span>
+                    <span v-if="index < 2" class="v-select__selection-text">
-                </span>
+                        {{ (item as any).name }}<span v-if="index < Math.min(filters.flightClass.length, 2) - 1">,&nbsp;</span>
-                <span v-if="index === 2" class="text-caption text-medium-emphasis">+{{ selectedFlightClasses.length - 2 }}</span>
+                    </span>
-            </template>
+                    <span v-if="index === 2" class="text-caption text-medium-emphasis">+{{ filters.flightClass.length - 2 }}</span>
-        </v-select>
+                </template>
+            </v-select>
 
-        <v-select
+            <v-select
-            v-if="availableOptions.flightReasons.length > 0"
+                v-if="availableOptions.flightReasons.length > 0"
-            v-model="selectedFlightReasons"
+                name="flightReason"
-            :items="availableOptions.flightReasons"
+                v-model="filters.flightReason"
-            item-title="name" item-value="id"
+                :items="availableOptions.flightReasons"
-            label="Flight Reason"
+                item-title="name" item-value="id"
-            multiple clearable hide-details
+                label="Flight Reason"
-            density="compact" variant="outlined"
+                multiple clearable hide-details
-            @update:model-value="emitFilters"
+                density="compact" variant="outlined"
-        >
+                @update:model-value="emitFilters"
-            <template #selection="{ item, index }">
+            >
-                <span v-if="index < 2" class="v-select__selection-text">
+                <template #selection="{ item, index }">
-                    {{ (item as any).name }}<span v-if="index < Math.min(selectedFlightReasons.length, 2) - 1">,&nbsp;</span>
+                    <span v-if="index < 2" class="v-select__selection-text">
-                </span>
+                        {{ (item as any).name }}<span v-if="index < Math.min(filters.flightReason.length, 2) - 1">,&nbsp;</span>
-                <span v-if="index === 2" class="text-caption text-medium-emphasis">+{{ selectedFlightReasons.length - 2 }}</span>
+                    </span>
-            </template>
+                    <span v-if="index === 2" class="text-caption text-medium-emphasis">+{{ filters.flightReason.length - 2 }}</span>
-        </v-select>
+                </template>
+            </v-select>
 
-        <v-select
+            <v-select
-            v-if="availableOptions.seatTypes.length > 0"
+                v-if="availableOptions.seatTypes.length > 0"
-            v-model="selectedSeatTypes"
+                name="seatType"
-            :items="availableOptions.seatTypes"
+                v-model="filters.seatType"
-            item-title="name" item-value="id"
+                :items="availableOptions.seatTypes"
-            label="Seat Type"
+                item-title="name" item-value="id"
-            multiple clearable hide-details
+                label="Seat Type"
-            density="compact" variant="outlined"
+                multiple clearable hide-details
-            @update:model-value="emitFilters"
+                density="compact" variant="outlined"
-        >
+                @update:model-value="emitFilters"
-            <template #selection="{ item, index }">
+            >
-                <span v-if="index < 2" class="v-select__selection-text">
+                <template #selection="{ item, index }">
-                    {{ (item as any).name }}<span v-if="index < Math.min(selectedSeatTypes.length, 2) - 1">,&nbsp;</span>
+                    <span v-if="index < 2" class="v-select__selection-text">
-                </span>
+                        {{ (item as any).name }}<span v-if="index < Math.min(filters.seatType.length, 2) - 1">,&nbsp;</span>
-                <span v-if="index === 2" class="text-caption text-medium-emphasis">+{{ selectedSeatTypes.length - 2 }}</span>
+                    </span>
-            </template>
+                    <span v-if="index === 2" class="text-caption text-medium-emphasis">+{{ filters.seatType.length - 2 }}</span>
-        </v-select>
+                </template>
+            </v-select>
 
-        <v-select
+            <v-select
-            v-if="availableOptions.manufacturers.length > 0"
+                v-if="availableOptions.manufacturers.length > 0"
-            v-model="selectedManufacturers"
+                name="manufacturer"
-            :items="availableOptions.manufacturers"
+                v-model="filters.manufacturer"
-            item-title="name" item-value="name"
+                :items="availableOptions.manufacturers"
-            label="Aircraft Manufacturer"
+                item-title="name" item-value="name"
-            multiple clearable hide-details
+                label="Aircraft Manufacturer"
-            density="compact" variant="outlined"
+                multiple clearable hide-details
-            @update:model-value="emitFilters"
+                density="compact" variant="outlined"
-        >
+                @update:model-value="emitFilters"
-            <template #selection="{ item, index }">
+            >
-                <span v-if="index < 2" class="v-select__selection-text">
+                <template #selection="{ item, index }">
-                    {{ (item as any).name }}<span v-if="index < Math.min(selectedManufacturers.length, 2) - 1">,&nbsp;</span>
+                    <span v-if="index < 2" class="v-select__selection-text">
-                </span>
+                        {{ (item as any).name }}<span v-if="index < Math.min(filters.manufacturer.length, 2) - 1">,&nbsp;</span>
-                <span v-if="index === 2" class="text-caption text-medium-emphasis">+{{ selectedManufacturers.length - 2 }}</span>
+                    </span>
-            </template>
+                    <span v-if="index === 2" class="text-caption text-medium-emphasis">+{{ filters.manufacturer.length - 2 }}</span>
-        </v-select>
+                </template>
+            </v-select>
 
-        <v-select
+            <v-select
-            v-if="availableOptions.aircraftModels.length > 0"
+                v-if="availableOptions.aircraftModels.length > 0"
-            v-model="selectedAircraftModels"
+                name="aircraftModel"
-            :items="availableOptions.aircraftModels"
+                v-model="filters.aircraftModel"
-            item-title="name" item-value="id"
+                :items="availableOptions.aircraftModels"
-            label="Aircraft Model"
+                item-title="name" item-value="id"
-            multiple clearable hide-details
+                label="Aircraft Model"
-            density="compact" variant="outlined"
+                multiple clearable hide-details
-            @update:model-value="emitFilters"
+                density="compact" variant="outlined"
-        >
+                @update:model-value="emitFilters"
-            <template #selection="{ item, index }">
+            >
-                <span v-if="index < 2" class="v-select__selection-text">
+                <template #selection="{ item, index }">
-                    {{ (item as any).name }}<span v-if="index < Math.min(selectedAircraftModels.length, 2) - 1">,&nbsp;</span>
+                    <span v-if="index < 2" class="v-select__selection-text">
-                </span>
+                        {{ (item as any).name }}<span v-if="index < Math.min(filters.aircraftModel.length, 2) - 1">,&nbsp;</span>
-                <span v-if="index === 2" class="text-caption text-medium-emphasis">+{{ selectedAircraftModels.length - 2 }}</span>
+                    </span>
-            </template>
+                    <span v-if="index === 2" class="text-caption text-medium-emphasis">+{{ filters.aircraftModel.length - 2 }}</span>
-        </v-select>
+                </template>
+            </v-select>
 
-        <v-select
+            <v-select
-            v-if="availableOptions.crewTypes.length > 0"
+                v-if="availableOptions.engineTypes.length > 0"
-            v-model="selectedCrewTypes"
+                name="engineType"
-            :items="availableOptions.crewTypes"
+                v-model="filters.engineType"
-            item-title="name" item-value="id"
+                :items="availableOptions.engineTypes"
-            label="Crew Type"
+                item-title="name" item-value="name"
-            multiple clearable hide-details
+                label="Engine Type"
-            density="compact" variant="outlined"
+                multiple clearable hide-details
-            @update:model-value="emitFilters"
+                density="compact" variant="outlined"
-        >
+                @update:model-value="emitFilters"
-            <template #selection="{ item, index }">
+            >
-                <span v-if="index < 2" class="v-select__selection-text">
+                <template #selection="{ item, index }">
-                    {{ (item as any).name }}<span v-if="index < Math.min(selectedCrewTypes.length, 2) - 1">,&nbsp;</span>
+                    <span v-if="index < 2" class="v-select__selection-text">
-                </span>
+                        {{ (item as any).name }}<span v-if="index < Math.min(filters.engineType.length, 2) - 1">,&nbsp;</span>
-                <span v-if="index === 2" class="text-caption text-medium-emphasis">+{{ selectedCrewTypes.length - 2 }}</span>
+                    </span>
-            </template>
+                    <span v-if="index === 2" class="text-caption text-medium-emphasis">+{{ filters.engineType.length - 2 }}</span>
-        </v-select>
+                </template>
-        <v-select
+            </v-select>
-            v-if="availableOptions.otherUsers.length > 0"
+
-            v-model="selectedOtherUsers"
+            <v-select
-            :items="availableOptions.otherUsers"
+                v-if="availableOptions.engineCounts.length > 0"
-            label="Flew With"
+                name="engineCount"
-            multiple clearable hide-details
+                v-model="filters.engineCount"
-            density="compact" variant="outlined"
+                :items="availableOptions.engineCounts"
-            @update:model-value="emitFilters"
+                item-title="count" item-value="count"
-        >
+                label="Engine Count"
-            <template #selection="{ item, index }">
+                multiple clearable hide-details
-        <span v-if="index < 2" class="v-select__selection-text">
+                density="compact" variant="outlined"
-            {{ item }}<span v-if="index < Math.min(selectedOtherUsers.length, 2) - 1">,&nbsp;</span>
+                @update:model-value="emitFilters"
-        </span>
+            >
-                <span v-if="index === 2" class="text-caption text-medium-emphasis">+{{ selectedOtherUsers.length - 2 }}</span>
+                <template #selection="{ item, index }">
-            </template>
+                    <span v-if="index < 2" class="v-select__selection-text">
-        </v-select>
+                        {{ (item as any).count }}<span v-if="index < Math.min(filters.engineCount.length, 2) - 1">,&nbsp;</span>
+                    </span>
+                    <span v-if="index === 2" class="text-caption text-medium-emphasis">+{{ filters.engineCount.length - 2 }}</span>
+                </template>
+            </v-select>
+
+            <v-select
+                v-if="availableOptions.crewTypes.length > 0"
+                name="crewType"
+                v-model="filters.crewType"
+                :items="availableOptions.crewTypes"
+                item-title="name" item-value="id"
+                label="Crew Type"
+                multiple clearable hide-details
+                density="compact" variant="outlined"
+                @update:model-value="emitFilters"
+            >
+                <template #selection="{ item, index }">
+                    <span v-if="index < 2" class="v-select__selection-text">
+                        {{ (item as any).name }}<span v-if="index < Math.min(filters.crewType.length, 2) - 1">,&nbsp;</span>
+                    </span>
+                    <span v-if="index === 2" class="text-caption text-medium-emphasis">+{{ filters.crewType.length - 2 }}</span>
+                </template>
+            </v-select>
+
+            <v-select
+                v-if="availableOptions.otherUsers.length > 0"
+                name="otherUsers"
+                v-model="filters.otherUsers"
+                :items="availableOptions.otherUsers"
+                label="Flew With"
+                multiple clearable hide-details
+                density="compact" variant="outlined"
+                @update:model-value="emitFilters"
+            >
+                <template #selection="{ item, index }">
+                    <span v-if="index < 2" class="v-select__selection-text">
+                        {{ item }}<span v-if="index < Math.min(filters.otherUsers.length, 2) - 1">,&nbsp;</span>
+                    </span>
+                    <span v-if="index === 2" class="text-caption text-medium-emphasis">+{{ filters.otherUsers.length - 2 }}</span>
+                </template>
+            </v-select>
+
+        </div>
     </div>
 </template>
 
@@ -543,4 +670,8 @@ const countryFlagClass = (code: string) =>
 .flight-filters .v-select {
     flex: 1 1 160px;
 }
+
+.flight-filters-actions {
+    margin-top: 12px;
+}
 </style>

resources/js/Components/FlightsGoneBy/FlightMap.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <div class="flight-map-wrapper">
+        <div class="flight-map-wrapper" :class="{ tooltip }">
             <PlaneLoader v-if="!mapReady" class="map-loader" />
             <div ref="mapContainer" class="map-container" :class="{ 'map-hidden': !mapReady }" />
             <button @click="exportMapBasic()" class="export-btn" title="Download as Image">
@@ -277,8 +277,11 @@ export default defineComponent({
         compact: {
             type: Boolean,
             default: false,
+        },
+        tooltip: {
+            type: Boolean,
+            default: false,
         }
-
     },
 
     setup(props) {
@@ -367,13 +370,37 @@ export default defineComponent({
             link.click()
         }
 
+        function loopPoints(origin: LngLat, radiusDeg = 0.4, steps = 48): LngLat[] {
+            const [lng, lat] = origin
+
+            // Widen the longitude radius to compensate for mercator distortion at this latitude
+            const lngRadius = radiusDeg / Math.max(Math.cos(lat * Math.PI / 180), 0.15)
+
+            // Center the loop above the origin so the airport point sits at the bottom of the loop
+            const centerLat = lat + radiusDeg
+
+            const points: LngLat[] = []
+            for (let i = 0; i <= steps; i++) {
+                const theta = (i / steps) * Math.PI * 2
+                points.push([
+                    lng + Math.sin(theta) * lngRadius,
+                    centerLat - radiusDeg * Math.cos(theta),
+                ])
+            }
+            return points // first and last point === origin, at the bottom of the loop
+        }
+
         const getArc = (flight: Flight): LngLat[] => {
             const key = routeKey(flight.departure_airport, flight.arrival_airport)
             if (!arcCache.has(key)) {
-                arcCache.set(key, greatCirclePoints(
+                const isSameAirport = flight.departure_airport.id === flight.arrival_airport.id
-                    [flight.departure_airport.longitude_deg, flight.departure_airport.latitude_deg],
+
-                    [flight.arrival_airport.longitude_deg,   flight.arrival_airport.latitude_deg],
+                arcCache.set(key, isSameAirport
-                ))
+                    ? loopPoints([flight.departure_airport.longitude_deg, flight.departure_airport.latitude_deg])
+                    : greatCirclePoints(
+                        [flight.departure_airport.longitude_deg, flight.departure_airport.latitude_deg],
+                        [flight.arrival_airport.longitude_deg,   flight.arrival_airport.latitude_deg],
+                    ))
             }
             return arcCache.get(key)!
         }
@@ -659,10 +686,14 @@ export default defineComponent({
 
         const fitBounds = (): void => {
             if (!props.flights.length) return
-            const padding = props.compact ? 40 : 60
+            const padding = props.compact
+                ? { top: 20, bottom: 20, left: 55, right: 55 }
+                : { top: 60, bottom: 60, left: 60, right: 60 }
 
-            const lngs = props.flights.flatMap(f => [f.departure_airport.longitude_deg, f.arrival_airport.longitude_deg])
+            // Use full arc/loop geometry, not just endpoints, so loops aren't clipped
-            const lats = props.flights.flatMap(f => [f.departure_airport.latitude_deg,  f.arrival_airport.latitude_deg])
+            const allPoints = props.flights.flatMap(getArc)
+            const lngs = allPoints.map(p => p[0])
+            const lats = allPoints.map(p => p[1])
 
             const minLat = Math.min(...lats)
             const maxLat = Math.max(...lats)
@@ -684,7 +715,6 @@ export default defineComponent({
             }
             map!.fitBounds([[minLng, minLat], [maxLng, maxLat]], { padding, duration: 0 })
         }
-
         // ── Map init ──────────────────────────────────────────────────────────
 
         const initMap = (): void => {
@@ -819,6 +849,11 @@ export default defineComponent({
         aspect-ratio: 7 / 10;
         max-height:   none;
     }
+
+    .flight-map-wrapper.tooltip {
+        aspect-ratio: 16 / 10;
+        max-height:   30vh;
+    }
 }
 
 small.attribution{

resources/js/Components/FlightsGoneBy/FlightToolTip.vue

@@ -40,7 +40,7 @@ defineProps<{
 
 
             <ToolTipRows  v-if="isActive.value">
-                <FlightMap :flights="[flight]" :showLegend="false" compact />
+                <FlightMap :flights="[flight]" :showLegend="false" compact tooltip />
             </ToolTipRows>
 
             <ToolTipDivider />

resources/js/Components/FlightsGoneBy/FollowingSelectBox.vue

@@ -0,0 +1,46 @@
+<script setup lang="ts">
+import { usePage, router } from "@inertiajs/vue3";
+import { SharedProps } from "@/Types/types";
+
+const props = withDefaults(
+    defineProps<{
+        redirectRoute: string;
+        routeParams?: Record<string, string | number>;
+        placeholder?: string;
+    }>(),
+    {
+        routeParams: () => ({}),
+    }
+);
+
+const page = usePage<SharedProps>().props;
+const following = [...page.auth?.following ?? [], page.auth?.user?.name]
+    .filter((x, i, a) => a.indexOf(x) === i);
+
+function onUpdate(user: string) {
+    if (!user) return;
+
+    router.get(
+        route(props.redirectRoute, {
+            user,
+            ...props.routeParams,
+        })
+    );
+}
+</script>
+
+<template>
+
+    <VSelect
+        v-if="following.length > 1"
+        :placeholder="placeholder"
+        variant="outlined"
+        density="comfortable"
+        :items="following"
+        @update:model-value="onUpdate"
+    >
+    </VSelect>
+</template>
+
+<style scoped>
+</style>

resources/js/Components/FlightsGoneBy/GenericBadgeTable.vue

@@ -4,6 +4,7 @@ defineProps<{
     rowKey: (row: T) => string | number
     hasItems: (row: T) => boolean
     labelWidth?: string
+    compactOnMobile?: boolean
 }>()
 </script>
 
@@ -15,7 +16,11 @@ defineProps<{
             class="badge-row"
         >
             <!-- Label column: consumer provides content -->
-            <div class="badge-label" :style="labelWidth ? `width: ${labelWidth}` : ''">
+            <div
+                class="badge-label"
+                :class="{ 'badge-label--compact': compactOnMobile }"
+                :style="labelWidth ? `width: ${labelWidth}` : ''"
+            >
                 <slot name="label" :row="row" />
             </div>
 
@@ -38,8 +43,6 @@ defineProps<{
     container-type: inline-size;
 }
 
-
-
 .badge-row {
     display: flex;
     align-items: center;
@@ -49,13 +52,13 @@ defineProps<{
 
 .badge-label {
     flex: 0 0 auto;
-    width: 15em;
+    width: 21em;
     padding: 0.5em;
     border-right: 1px solid var(--table-border);
     align-self: stretch;
     display: flex;
     align-items: center;
-    font-size:0.9rem;
+    font-size: 0.9rem;
 }
 
 @container (max-width: 480px) {
@@ -63,6 +66,12 @@ defineProps<{
         font-size: 0.75rem;
         width: 9em;
     }
+
+    .badge-label--compact {
+        font-size: 0.7rem;
+        width: clamp(6em, 50cqw, 9em);
+        flex-shrink: 0;
+    }
 }
 
 .badge-scroll-container {

resources/js/Components/FlightsGoneBy/Liveries/LiveryImage.vue

@@ -25,5 +25,4 @@ defineProps<{
     background-size: cover;
     min-width: 300px;
 }
-
 </style>

resources/js/Components/FlightsGoneBy/MainFooter.vue

@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { Link, usePage } from "@inertiajs/vue3"
 import { SharedProps } from "@/Types/types"
+import CopyPageButton from "@/Components/FlightsGoneBy/CopyPageButton.vue";
 
 const page = usePage<SharedProps>().props
 const year = new Date().getFullYear()
@@ -63,9 +64,17 @@ footer {
     color: #ffc107;
 }
 
+.footer-version {
+    opacity: 0.8;
+    margin-left: 0.4em;
+}
+
 @media (max-width: 600px) {
     footer {
-        padding: 0 1rem;
+        flex-wrap: wrap;
+        flex: 0 0 auto;
+        row-gap: 0.5rem;
+        padding: 0.6rem 1rem;
     }
 
     .footer-copyright {
@@ -75,10 +84,6 @@ footer {
     .footer-link {
         font-size: 0.6rem;
     }
-}
 
-.footer-version {
-    opacity: 0.8;
-    margin-left: 0.4em;
 }
 </style>

resources/js/Components/FlightsGoneBy/MainHeader.vue

@@ -5,6 +5,7 @@ import type { SharedProps } from '@/Types/types'
 import { ref, onMounted, onUnmounted } from 'vue'
 import NotificationMenu from "@/Components/FlightsGoneBy/NotificationMenu.vue";
 import Logo from "@/Components/FlightsGoneBy/Logo.vue";
+import UserSearchBox from "@/Components/UserSearchBox.vue";
 
 const page = usePage<SharedProps>()
 const menuOpen = ref(false)
@@ -30,6 +31,7 @@ onUnmounted(() => document.removeEventListener('click', handleClickOutside))
             <Logo variant="color" />
         </Link>
 
+        <UserSearchBox class="nav-desktop" density="compact" style="max-width:400px; width: 400px;" />
         <NotificationMenu v-if="page.props.auth?.user" :unread-count="page.props.unread_notification_count" />
 
         <!-- Desktop nav -->
@@ -369,5 +371,6 @@ header {
 @media (max-width: 600px) {
     .nav-desktop { display: none; }
     .hamburger { display: flex; }
+    .user-search-box { display: none; }
 }
 </style>

resources/js/Components/FlightsGoneBy/NotificationMenu.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, watch, onMounted } from 'vue'
+import { ref, watch, onMounted, onUnmounted } from 'vue'
 import axios from "axios";
 import { Notification } from "@/Types/types";
 import { Link } from "@inertiajs/vue3";
@@ -18,6 +18,7 @@ onMounted(() => {
 const open = ref(false)
 const notifications = ref<Notification[]>([])
 const loading = ref(false)
+const wrapperRef = ref<HTMLElement | null>(null)
 
 const markAllRead = async (notifications: Notification[]) => {
     const unread = notifications.filter(n => !n.read_at)
@@ -27,6 +28,20 @@ const markAllRead = async (notifications: Notification[]) => {
     unread.forEach(n => n.read_at = new Date().toISOString())
 }
 
+const handleClickOutside = (event: MouseEvent) => {
+    if (open.value && wrapperRef.value && !wrapperRef.value.contains(event.target as Node)) {
+        open.value = false
+    }
+}
+
+onMounted(() => {
+    document.addEventListener('click', handleClickOutside)
+})
+
+onUnmounted(() => {
+    document.removeEventListener('click', handleClickOutside)
+})
+
 watch(open, async (isOpen) => {
     if (!isOpen) return
 
@@ -43,7 +58,7 @@ watch(open, async (isOpen) => {
 </script>
 
 <template>
-    <div class="notif-wrapper">
+    <div class="notif-wrapper" ref="wrapperRef">
         <v-btn icon variant="text" @click="open = !open" aria-label="Notifications">
             <v-badge :content="store.unreadCount" :model-value="store.unreadCount > 0" color="primary">
                 <v-icon>mdi-bell-outline</v-icon>
@@ -106,6 +121,16 @@ watch(open, async (isOpen) => {
     overflow: hidden;
 }
 
+@media (max-width: 480px) {
+    .notif-menu {
+        position: fixed;
+        top: 4.5rem; /* adjust to sit just below your navbar height */
+        left: 50%;
+        transform: translateX(-50%);
+        width: min(320px, calc(100vw - 1.5rem));
+    }
+}
+
 .notif-header {
     display: flex;
     align-items: center;

resources/js/Components/FlightsGoneBy/Panels/RoutePanel.vue

@@ -4,6 +4,7 @@ import FlightMap from "@/Components/FlightsGoneBy/FlightMap.vue";
 import Panel from "@/Components/FlightsGoneBy/Panels/Panel.vue";
 import DetailRows from "@/Components/FlightsGoneBy/Panels/DetailRows.vue";
 import DetailRow from "@/Components/FlightsGoneBy/Panels/DetailRow.vue";
+import PanelLabel from "@/Components/FlightsGoneBy/Panels/PanelLabel.vue";
 
 defineProps<{
     flight: Flight
@@ -19,6 +20,10 @@ defineProps<{
             <DetailRow label="Distance" :value="flight.distance + 'km'" />
             <DetailRow label="Duration" :value="flight.duration_display" />
         </DetailRows>
+        <DetailRows>
+            <PanelLabel v-if="flight.note?.length">Notes</PanelLabel>
+            {{flight.note}}
+        </DetailRows>
     </Panel>
 </template>
 

resources/js/Components/FlightsGoneBy/ToastNotifications.vue

@@ -16,7 +16,7 @@ const store = useNotificationStore();
                 max-width="360"
             >
                 <v-card-text class="d-flex align-center ga-3">
-                    <v-icon icon="mdi-trophy" color="amber" size="32" />
+                    <v-icon :icon="notification.is_achievement ? 'mdi-trophy' : 'mdi-bell-ring'" color="amber" size="32" />
                     <div>
                         <div class="text-subtitle-2 font-weight-bold">{{ notification.title }}</div>
                         <div class="text-body-2 text-medium-emphasis">{{ notification.body }}</div>

resources/js/Components/FlightsGoneBy/Tooltips/MissingEntityLink.vue

@@ -0,0 +1,53 @@
+<script setup lang="ts">
+import GlassTooltip from '@/Components/FlightsGoneBy/GlassTooltip.vue'
+import type { Anchor } from 'vuetify'
+
+withDefaults(defineProps<{
+    label?: string
+    location?: Anchor
+}>(), {
+    label: 'Missing something?',
+})
+
+defineSlots<{
+    default(): any
+}>()
+</script>
+
+<template>
+    <GlassTooltip  :location="location ?? 'top'" :open-delay="150">
+        <template #activator="{ props: activatorProps }">
+            <button
+                v-bind="activatorProps"
+                type="button"
+                class="missing-entity-link"
+            >
+                {{ label }}
+            </button>
+        </template>
+
+        <template #default>
+            <slot />
+        </template>
+    </GlassTooltip>
+</template>
+
+<style scoped>
+.missing-entity-link {
+    display: inline-block;
+    margin-top: 4px;
+    padding: 0;
+    background: none;
+    border: none;
+    font-size: 12px;
+    color: rgba(255, 255, 255, 0.55);
+    text-decoration: underline;
+    text-underline-offset: 2px;
+    cursor: pointer;
+    transition: color 0.15s ease;
+}
+
+.missing-entity-link:hover {
+    color: rgba(255, 255, 255, 0.85);
+}
+</style>

resources/js/Components/UserSearchBox.vue

@@ -0,0 +1,84 @@
+<script setup lang="ts">
+import { ref, watch } from 'vue'
+import { Link } from '@inertiajs/vue3'
+
+defineProps<{
+    density?: null | 'default' | 'comfortable' | 'compact';
+}>()
+
+interface UserOption {
+    value: number
+    title: string
+}
+
+const search = ref('')
+const selectedUser = ref<UserOption | null>(null)
+const items = ref<UserOption[]>([])
+const loading = ref(false)
+
+let debounceTimeout: ReturnType<typeof setTimeout> | undefined
+
+async function fetchUsers(query: string) {
+    if (!query) {
+        items.value = []
+        return
+    }
+
+    loading.value = true
+    try {
+        const response = await fetch(`/search/users?q=${encodeURIComponent(query)}`)
+        if (!response.ok) throw new Error('Failed to fetch users')
+        items.value = await response.json()
+    } catch (error) {
+        console.error('User search failed:', error)
+        items.value = []
+    } finally {
+        loading.value = false
+    }
+}
+
+watch(search, (newQuery) => {
+    clearTimeout(debounceTimeout)
+    debounceTimeout = setTimeout(() => {
+        fetchUsers(newQuery)
+    }, 300)
+})
+</script>
+
+<template>
+    <div class="user-search-box">
+        <v-autocomplete
+            v-model="selectedUser"
+            v-model:search="search"
+            :items="items"
+            :loading="loading"
+            item-title="title"
+            item-value="value"
+            return-object
+            label="Search users"
+            placeholder="Type a name..."
+            prepend-inner-icon="mdi-magnify"
+            :density="density ?? 'default'"
+            variant="outlined"
+            no-filter
+            clearable
+            hide-details
+            hide-no-data
+            autocomplete="off"
+        >
+            <template #item="{ item }">
+                <Link :href="`/u/${item.title}`" class="user-search-result">
+                    <v-list-item :title="item.title" />
+                </Link>
+            </template>
+        </v-autocomplete>
+    </div>
+</template>
+
+<style scoped>
+.user-search-box {
+    display: block;
+    align-self: center;
+    width: 100%;
+}
+</style>

resources/js/Composables/useFlightStats.ts

@@ -175,7 +175,7 @@ export function getCountries(flights: Flight[], upcomingFlights: Flight[]) {
     const result = {
         countries: sorted,
         series: [
-            { name: 'Departed',  data: sorted.map(s => s.past) },
+            { name: 'Flown',  data: sorted.map(s => s.past) },
             { name: 'Upcoming', data: sorted.map(s => s.upcoming) },
         ],
     }

resources/js/Layouts/MainLayout.vue

@@ -9,6 +9,7 @@ import { ref } from "vue";
 import NotificationListener from "@/Components/FlightsGoneBy/NotificationListener.vue";
 import {SharedProps} from "@/Types/types";
 import PushNotificationPrompt from "@/Components/PushNotificationPrompt.vue";
+import CopyPageButton from "@/Components/FlightsGoneBy/CopyPageButton.vue";
 const transitionKey = ref(0);
 
 const page = usePage<SharedProps>().props
@@ -27,6 +28,9 @@ router.on('success', () => {
                     <slot />
                 </main>
             </Transition>
+            <span class="footer-share">
+                <CopyPageButton label="Share Link" />
+            </span>
             <MainFooter :key="`footer-${transitionKey}`" />
         </div>
         <NotificationListener v-if="page.auth.user?.id" :user-id="page.auth.user?.id" />
@@ -51,6 +55,14 @@ footer {
     min-height: 3rem;
 }
 
+@media (max-width: 600px) {
+    footer {
+        flex: 0 1 auto;
+        min-height: 3.25rem;
+        padding-block: 0.35rem;
+    }
+}
+
 main {
     flex: 1 1 auto;
     background: transparent;
@@ -60,6 +72,12 @@ main {
     align-items: center;
 }
 
+.footer-share {
+    padding:1em;
+    display: flex;
+    justify-content: center;
+}
+
 .fade-enter-from,
 .fade-leave-to { opacity: 0; }
 .fade-enter-active,

resources/js/Pages/AddFlight.vue

@@ -6,8 +6,9 @@ import AirlineSearchBox from '@/Components/FlightsGoneBy/AirlineSearchBox.vue'
 import AircraftSearchBox from '@/Components/FlightsGoneBy/AircraftSearchBox.vue'
 import AirportSearchBox from '@/Components/FlightsGoneBy/AirportSearchBox.vue'
 import type {SeatType, FlightReason, FlightClass, CrewType, SharedProps} from '@/Types/types'
-import { ref, watch, computed } from 'vue'
+import { ref, watch, computed, onMounted, nextTick } from 'vue'
 import { VTimePicker, VDatePicker } from 'vuetify/components'
+import MissingEntityLink from "@/Components/FlightsGoneBy/Tooltips/MissingEntityLink.vue";
 
 defineOptions({ layout: MainLayout })
 const page = usePage<SharedProps>().props
@@ -49,25 +50,13 @@ const pad = (n: number) => String(n).padStart(2, '0')
 const flightNumber   = ref(props.flight?.flight_number ?? '')
 const lookupLoading  = ref(false)
 const lookupError    = ref<string | null>(null)
-const lookupComplete = ref(true)
 
-interface LookupResult {
-    airline_options:  { value: number; title: string, logo_url: string }[]
-    from_options:     { value: number; title: string; country_code: string }[]
-    to_options:       { value: number; title: string; country_code: string }[]
-    aircraft_options: { value: number; title: string }[]
-    scheduled_departure_time: string | null
-    scheduled_arrival_time: string | null
-}
-
-const lookupResult = ref<LookupResult | null>(null)
 const lookupKey = ref(0)
 
 async function lookupFlight() {
     if (!flightNumber.value.trim()) return
     lookupLoading.value = true
     lookupError.value   = null
-    lookupResult.value  = null
 
     try {
         const response = await fetch(`${route('flights.lookup')}?number=${encodeURIComponent(flightNumber.value.trim())}`, {
@@ -78,8 +67,6 @@ async function lookupFlight() {
             lookupError.value = data.message ?? 'Lookup failed.'
             return
         }
-        lookupResult.value   = data
-        lookupComplete.value = true
         if (data.airline_options?.length) {
             airlineOptionsData.value = data.airline_options
             if (!form.airline) form.airline = data.airline_options[0]
@@ -111,6 +98,12 @@ async function lookupFlight() {
         }
         suppressArrivalAutoFill = false
 
+        // NOTE: if the lookup API is ever extended to return a day
+        // difference for the arrival (e.g. `data.arrival_day_offset`),
+        // wire it in here: `arrivalOffset.value = data.arrival_day_offset`
+        // (clamped/mapped to 'custom' if outside -1..2). Left out for now
+        // since the API doesn't provide it yet.
+
         lookupKey.value++
     } catch (e) {
         lookupError.value = String(e)
@@ -122,7 +115,6 @@ async function lookupFlight() {
 // ── Display form (drives the template) ───────────────────────────────────────
 
 const form = useForm({
-    flight_number:         props.flight?.flight_number         ?? '',
     departure_date:        props.flight?.departure_date        ?? '',
     arrival_date:          props.flight?.arrival_date          ?? '',
     from:                  props.flight?.from_options[0]       ?? null as { value: number; title: string; country_code: string } | null,
@@ -163,9 +155,9 @@ const submitForm = useForm({
     crew_type_id:          null as number | null,
     note:                  '' as string | null,
     auto_update:           false,
+    add_more:              false,
 })
 
-
 const departureIsFuture = computed(() => {
     if (!form.departure_date) return false
     return new Date(form.departure_date) > new Date()
@@ -177,7 +169,7 @@ watch(departureIsFuture, (isFuture) => {
 }, { immediate: true })
 
 
-function submit() {
+function submit(addMore = false) {
     submitForm.flight_number         = flightNumber.value
     submitForm.departure_date        = form.departure_date
     submitForm.arrival_date          = form.arrival_date
@@ -193,6 +185,7 @@ function submit() {
     submitForm.crew_type_id          = form.crew_type?.id ?? null
     submitForm.note                  = form.note
     submitForm.auto_update           = form.auto_update
+    submitForm.add_more              = addMore
 
     if (isEdit) {
         submitForm.put(route('flights.update', { flight: props.flight!.id }))
@@ -230,9 +223,15 @@ function combineDateTime(date: Date | null, time: string | null): string {
     return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())}T${(hh ?? '00').padStart(2, '0')}:${(mm ?? '00').padStart(2, '0')}`
 }
 
-function clearDepartureDate() { departureDatePart.value = null }
+// Whole-day difference between two Date objects (time-of-day ignored).
+function diffInDays(from: Date | null, to: Date | null): number | null {
+    if (!from || !to) return null
+    const a = new Date(from.getFullYear(), from.getMonth(), from.getDate())
+    const b = new Date(to.getFullYear(), to.getMonth(), to.getDate())
+    return Math.round((b.getTime() - a.getTime()) / 86_400_000)
+}
+
 function clearDepartureTime() { departureTimePart.value = null }
-function clearArrivalDate()   { arrivalDatePart.value = null }
 function clearArrivalTime()   { arrivalTimePart.value = null }
 
 // Normalizes whatever shape the API sends a scheduled time in ("14:30",
@@ -278,19 +277,88 @@ watch([arrivalDatePart, arrivalTimePart], () => {
     form.arrival_date = combineDateTime(arrivalDatePart.value, arrivalTimePart.value)
 })
 
-// Auto-fill arrival (+1hr) the first time a departure TIME is chosen (and a
+// ── Arrival day offset ───────────────────────────────────────────────────────
-// departure date is already set) and arrival is still empty. Picking the
+// Rather than making the user pick an independent arrival date, arrival date
-// departure date alone no longer triggers this — only setting the time does.
+// is normally *derived* from departure date + a small relative offset
+// (-1 / Same day / +1 / +2). "Custom" drops back to a real date picker for
+// the rare case that falls outside that range. This avoids needing airport
+// time zones to work out the arrival date, which a duration-based input
+// would require.
+
+type ArrivalOffset = -1 | 0 | 1 | 2
+
+const arrivalOffsetOptions: { value: ArrivalOffset; label: string }[] = [
+    { value: -1, label: '−1 Day' },
+    { value: 0,  label: 'Same Day' },
+    { value: 1,  label: '+1 Day' },
+    { value: 2,  label: '+2 Days' },
+]
+
+const initialDiff = diffInDays(depInit.date, arrInit.date)
+const initialDiffIsQuickOption = initialDiff !== null && ([-1, 0, 1, 2] as number[]).includes(initialDiff)
+
+// 'offset' (the default): arrival date is derived from departure date + the
+// selected quick offset. 'custom': the user has dropped into a real date
+// picker, e.g. because the actual gap is more than +2 days.
+const arrivalDateMode = ref<'offset' | 'custom'>(
+    initialDiff !== null && !initialDiffIsQuickOption ? 'custom' : 'offset'
+)
+
+const arrivalOffset = ref<ArrivalOffset>(
+    initialDiffIsQuickOption ? (initialDiff as ArrivalOffset) : 0
+)
+
+function applyArrivalOffset() {
+    if (suppressArrivalAutoFill) return
+    if (arrivalDateMode.value === 'custom') return
+    if (!departureDatePart.value) {
+        arrivalDatePart.value = null
+        return
+    }
+    const d = new Date(departureDatePart.value)
+    d.setDate(d.getDate() + arrivalOffset.value)
+    arrivalDatePart.value = d
+}
+
+// Re-derive arrival date whenever departure date moves, or the offset is
+// changed by hand.
+watch(departureDatePart, applyArrivalOffset)
+watch(arrivalOffset, applyArrivalOffset)
+
+function useCustomArrivalDate() {
+    arrivalDateMode.value = 'custom'
+}
+
+function useQuickArrivalOffset() {
+    arrivalDateMode.value = 'offset'
+    applyArrivalOffset()
+}
+
+function formatFullDate(d: Date | null): string {
+    if (!d) return ''
+    return d.toLocaleDateString(undefined, { weekday: 'short', day: 'numeric', month: 'short', year: 'numeric' })
+}
+
+// Auto-fill arrival TIME (+1hr) the first time a departure time is chosen
+// (and a departure date is already set) and arrival time is still empty.
+// If adding the hour rolls over midnight, bump the offset selector to match
+// (e.g. departs 23:30 -> offset flips to "+1") so the resolved arrival date
+// stays correct without the user having to notice and fix it themselves.
 watch(departureTimePart, (newTime) => {
     if (suppressArrivalAutoFill) return
-    if (!newTime || !departureDatePart.value || arrivalDatePart.value) return
+    if (arrivalDateMode.value === 'custom') return
+    if (!newTime || !departureDatePart.value || arrivalTimePart.value) return
 
     const dep = new Date(departureDatePart.value)
     const [h, m] = newTime.split(':').map(Number)
     dep.setHours(h, m)
     const arr = new Date(dep.getTime() + 60 * 60 * 1000)
 
+    const rawDiff = diffInDays(departureDatePart.value, arr) ?? 0
+    const clampedDiff = Math.min(Math.max(rawDiff, -1), 2) as -1 | 0 | 1 | 2
+
     suppressArrivalAutoFill = true
+    arrivalOffset.value = clampedDiff
     arrivalDatePart.value = new Date(arr.getFullYear(), arr.getMonth(), arr.getDate())
     arrivalTimePart.value = `${pad(arr.getHours())}:${pad(arr.getMinutes())}`
     suppressArrivalAutoFill = false
@@ -313,11 +381,31 @@ const arrivalMaxDate = computed(() => arrivalMax.value ? new Date(arrivalMax.val
 
 // ── Native date inputs ───────────────────────────────────────────────────────
 // departureDatePart / arrivalDatePart stay the source of truth as Date
-// objects. These computed get/set pairs are what the native <input type=date>
+// objects. The <input type="date"> elements below are deliberately left
-// elements bind to — the browser handles locale display, typing, and
+// UNCONTROLLED from Vue's perspective — no v-model, no :model-value, no
-// validation itself, so no custom format-aware parsing is needed here.
+// reactive :value binding of any kind. That's on purpose: any reactive
-// The Vuetify v-date-picker is still available via a separate calendar icon
+// binding through Vuetify's v-text-field — even one that only commits on
-// for users who prefer to pick from a calendar rather than type.
+// blur/change, not every keystroke — still runs through v-text-field's own
+// internal echo of the field, which re-renders the wrapped <input> on every
+// keystroke regardless of what we bind from outside. For type="date"
+// specifically, that internal re-render resets the browser's own
+// per-segment editing state mid-type (day/month/year), which is what was
+// scrambling what you typed. Using a genuinely uncontrolled native <input>
+// (not wrapped in v-text-field at all) sidesteps that entirely.
+//
+// We grab a direct DOM ref to each native input and manage its .value
+// imperatively instead:
+//   - once on mount, to show the initial value
+//   - whenever departureDatePart/arrivalDatePart changes from elsewhere
+//     (the calendar picker, a flight lookup, auto-fill) — but only if the
+//     field isn't currently focused, so we never fight with active typing
+//   - the native `change` event (fires once a full date has been entered
+//     and committed, or cleared) is what flows the typed value back into
+//     departureDatePart/arrivalDatePart
+// This keeps the real native, locale-aware date input and picker UI intact.
+//
+// The arrival native date input only exists in the DOM while arrivalOffset
+// is 'custom' (see template); its value is (re)synced whenever it mounts.
 
 function toIsoDateString(d: Date | null): string {
     if (!d) return ''
@@ -331,16 +419,42 @@ function fromIsoDateString(value: string): Date | null {
     return new Date(y, m - 1, d)
 }
 
-const departureDateValue = computed({
+const departureDateEl = ref<HTMLInputElement | null>(null)
-    get: () => toIsoDateString(departureDatePart.value),
+const arrivalDateEl   = ref<HTMLInputElement | null>(null)
-    set: (value: string) => { departureDatePart.value = fromIsoDateString(value) },
+
+onMounted(() => {
+    if (departureDateEl.value) departureDateEl.value.value = toIsoDateString(departureDatePart.value)
+    if (arrivalDateEl.value)   arrivalDateEl.value.value   = toIsoDateString(arrivalDatePart.value)
 })
 
-const arrivalDateValue = computed({
+watch(departureDatePart, (d) => {
-    get: () => toIsoDateString(arrivalDatePart.value),
+    const el = departureDateEl.value
-    set: (value: string) => { arrivalDatePart.value = fromIsoDateString(value) },
+    if (el && document.activeElement !== el) el.value = toIsoDateString(d)
 })
 
+watch(arrivalDatePart, (d) => {
+    const el = arrivalDateEl.value
+    if (el && document.activeElement !== el) el.value = toIsoDateString(d)
+})
+
+// The arrival native input only exists while arrivalDateMode === 'custom',
+// so re-sync its value whenever it (re)mounts into the DOM.
+watch(arrivalDateMode, async (mode) => {
+    if (mode !== 'custom') return
+    await nextTick()
+    if (arrivalDateEl.value) arrivalDateEl.value.value = toIsoDateString(arrivalDatePart.value)
+})
+
+function commitDepartureDateInput(e: Event) {
+    const value = (e.target as HTMLInputElement).value
+    departureDatePart.value = value ? fromIsoDateString(value) : null
+}
+
+function commitArrivalDateInput(e: Event) {
+    const value = (e.target as HTMLInputElement).value
+    arrivalDatePart.value = value ? fromIsoDateString(value) : null
+}
+
 // ── Editable, format-aware time text fields ────────────────────────────────
 // departureTimePart / arrivalTimePart stay the source of truth as internal
 // "HH:mm" (24hr) strings. These input refs are what the text-fields actually
@@ -472,30 +586,33 @@ function commitArrivalTimeInput() {
                 <!-- ── Departure date + time ──────────────────────────────── -->
                 <v-row>
                     <v-col cols="12" sm="6">
-                        <v-text-field
+                        <div class="native-date-field">
-                            v-model="departureDateValue"
+                            <v-icon icon="mdi-calendar" size="20" class="native-date-field__icon" />
-                            type="date"
+                            <label class="native-date-field__label">Departure Date</label>
-                            label="Departure Date"
+                            <input
-                            prepend-inner-icon="mdi-calendar"
+                                ref="departureDateEl"
-                            :disabled="!lookupComplete"
+                                type="date"
-                            :error-messages="submitForm.errors.departure_date"
+                                class="native-date-field__input"
-                        >
+                                @change="commitDepartureDateInput"
-                            <template #append-inner>
+                            >
-                                <v-menu v-model="depDateMenu" :close-on-content-click="false">
+                            <v-menu v-model="depDateMenu" :close-on-content-click="false">
-                                    <template #activator="{ props: menuProps }">
+                                <template #activator="{ props: menuProps }">
-                                        <v-icon
+                                    <v-icon
-                                            v-bind="menuProps"
+                                        v-bind="menuProps"
-                                            icon="mdi-calendar-month"
+                                        icon="mdi-calendar-month"
-                                            style="cursor: pointer"
+                                        size="20"
-                                        />
+                                        style="cursor: pointer"
-                                    </template>
-                                    <v-date-picker
-                                        v-model="departureDatePart"
-                                        @update:model-value="depDateMenu = false"
                                     />
-                                </v-menu>
+                                </template>
-                            </template>
+                                <v-date-picker
-                        </v-text-field>
+                                    v-model="departureDatePart"
+                                    @update:model-value="depDateMenu = false"
+                                />
+                            </v-menu>
+                        </div>
+                        <div v-if="submitForm.errors.departure_date" class="native-date-field__error text-error">
+                            {{ submitForm.errors.departure_date }}
+                        </div>
                     </v-col>
                     <v-col cols="12" sm="6">
                         <v-menu v-model="depTimeMenu" :close-on-content-click="false">
@@ -507,7 +624,6 @@ function commitArrivalTimeInput() {
                                     clearable
                                     prepend-inner-icon="mdi-clock-outline"
                                     :placeholder="timeFormat === '24hr' ? 'e.g. 1430' : 'e.g. 2:30 PM'"
-                                    :disabled="!lookupComplete"
                                     @click:clear="clearDepartureTime"
                                     @blur="commitDepartureTimeInput"
                                     @keydown.enter="commitDepartureTimeInput"
@@ -528,23 +644,59 @@ function commitArrivalTimeInput() {
                     </v-col>
                 </v-row>
 
-                <!-- ── Arrival date + time ─────────────────────────────────── -->
+                <!-- ── Arrival ───────────────────────────────────────────── -->
                 <v-row>
                     <v-col cols="12" sm="6">
-                        <v-text-field
+                        <label class="arrival-offset__label">Arrival Date</label>
-                            v-model="arrivalDateValue"
+
-                            type="date"
+                        <template v-if="arrivalDateMode === 'offset'">
-                            label="Arrival Date"
+                            <v-btn-toggle
-                            prepend-inner-icon="mdi-calendar"
+                                v-model="arrivalOffset"
-                            :disabled="!lookupComplete"
+                                mandatory
-                            :error-messages="submitForm.errors.arrival_date"
+                                variant="outlined"
-                        >
+                                color="primary"
-                            <template #append-inner>
+                                divided
+                                class="arrival-offset__toggle"
+                            >
+                                <v-btn
+                                    v-for="opt in arrivalOffsetOptions"
+                                    :key="opt.value"
+                                    :value="opt.value"
+                                    class="arrival-offset__btn"
+                                >
+                                    {{ opt.label }}
+                                </v-btn>
+                            </v-btn-toggle>
+
+                            <div class="arrival-offset__footer">
+                                <span v-if="arrivalDatePart" class="arrival-offset__hint">
+                                    Arrives {{ formatFullDate(arrivalDatePart) }}
+                                </span>
+                                <button
+                                    type="button"
+                                    class="arrival-offset__link"
+                                    @click="useCustomArrivalDate"
+                                >
+                                    Custom date
+                                </button>
+                            </div>
+                        </template>
+
+                        <template v-else>
+                            <div class="native-date-field">
+                                <v-icon icon="mdi-calendar" size="20" class="native-date-field__icon" />
+                                <input
+                                    ref="arrivalDateEl"
+                                    type="date"
+                                    class="native-date-field__input"
+                                    @change="commitArrivalDateInput"
+                                >
                                 <v-menu v-model="arrDateMenu" :close-on-content-click="false">
                                     <template #activator="{ props: menuProps }">
                                         <v-icon
                                             v-bind="menuProps"
                                             icon="mdi-calendar-month"
+                                            size="20"
                                             style="cursor: pointer"
                                         />
                                     </template>
@@ -555,8 +707,19 @@ function commitArrivalTimeInput() {
                                         @update:model-value="arrDateMenu = false"
                                     />
                                 </v-menu>
-                            </template>
+                            </div>
-                        </v-text-field>
+                            <button
+                                type="button"
+                                class="arrival-offset__link mt-1"
+                                @click="useQuickArrivalOffset"
+                            >
+                                Use quick select instead
+                            </button>
+                        </template>
+
+                        <div v-if="submitForm.errors.arrival_date" class="native-date-field__error text-error">
+                            {{ submitForm.errors.arrival_date }}
+                        </div>
                     </v-col>
                     <v-col cols="12" sm="6">
                         <v-menu v-model="arrTimeMenu" :close-on-content-click="false">
@@ -568,7 +731,6 @@ function commitArrivalTimeInput() {
                                     clearable
                                     prepend-inner-icon="mdi-clock-outline"
                                     :placeholder="timeFormat === '24hr' ? 'e.g. 1430' : 'e.g. 2:30 PM'"
-                                    :disabled="!lookupComplete"
                                     @click:clear="clearArrivalTime"
                                     @blur="commitArrivalTimeInput"
                                     @keydown.enter="commitArrivalTimeInput"
@@ -597,8 +759,11 @@ function commitArrivalTimeInput() {
                             label="From"
                             :prefilled-options="fromOptionsData"
                             :error-messages="submitForm.errors.from_id"
-                            :disabled="!lookupComplete"
                         />
+                        <MissingEntityLink label="Missing airport?">
+                            <p>If you can't find an airport we will be happy to add it, but you'll have to contact support with details of the airport.</p>
+                            <p>Unfortunately you won't be able to proceed with adding this flight until the airport has been added.</p>
+                        </MissingEntityLink>
                     </v-col>
                 </v-row>
 
@@ -610,7 +775,6 @@ function commitArrivalTimeInput() {
                             label="To"
                             :prefilled-options="toOptionsData"
                             :error-messages="submitForm.errors.to_id"
-                            :disabled="!lookupComplete"
                         />
                     </v-col>
                 </v-row>
@@ -623,8 +787,11 @@ function commitArrivalTimeInput() {
                             v-model="form.airline"
                             :prefilled-options="airlineOptionsData"
                             :error-messages="submitForm.errors.airline_id"
-                            :disabled="!lookupComplete"
                         />
+                        <MissingEntityLink label="Missing airline? No problem">
+                            <p>If you can't find the airline you flew with, just leave it blank but make sure to add a valid flight number. We will be notified of flights with missing airlines and add the airline shortly.</p>
+                            <p>If you don't know your flight number or a missing airline hasn't been added within 48 hours, please contact support.</p>
+                        </MissingEntityLink>
                     </v-col>
                 </v-row>
 
@@ -636,7 +803,6 @@ function commitArrivalTimeInput() {
                             v-model="form.aircraft"
                             :prefilled-options="aircraftOptionsData"
                             :error-messages="submitForm.errors.aircraft_id"
-                            :disabled="!lookupComplete"
                         />
                     </v-col>
                 </v-row>
@@ -648,7 +814,6 @@ function commitArrivalTimeInput() {
                             v-model="form.aircraft_registration"
                             label="Aircraft Registration"
                             placeholder="e.g. VH-OQA"
-                            :disabled="!lookupComplete"
                             :error-messages="submitForm.errors.aircraft_registration"
                         />
                     </v-col>
@@ -660,7 +825,6 @@ function commitArrivalTimeInput() {
                             item-title="name"
                             item-value="id"
                             :return-object="true"
-                            :disabled="!lookupComplete"
                             :error-messages="submitForm.errors.flight_class_id"
                         />
                     </v-col>
@@ -673,7 +837,6 @@ function commitArrivalTimeInput() {
                             v-model="form.seat_number"
                             label="Seat Number"
                             placeholder="e.g. 12A"
-                            :disabled="!lookupComplete"
                             :error-messages="submitForm.errors.seat_number"
                         />
                     </v-col>
@@ -685,7 +848,6 @@ function commitArrivalTimeInput() {
                             item-title="name"
                             item-value="id"
                             :return-object="true"
-                            :disabled="!lookupComplete"
                             :error-messages="submitForm.errors.seat_type_id"
                         />
                     </v-col>
@@ -701,7 +863,6 @@ function commitArrivalTimeInput() {
                             item-title="name"
                             item-value="id"
                             :return-object="true"
-                            :disabled="!lookupComplete"
                             :error-messages="submitForm.errors.flight_reason_id"
                         />
                     </v-col>
@@ -713,7 +874,6 @@ function commitArrivalTimeInput() {
                             item-title="name"
                             item-value="id"
                             :return-object="true"
-                            :disabled="!lookupComplete"
                             :error-messages="submitForm.errors.crew_type_id"
                         />
                     </v-col>
@@ -726,7 +886,6 @@ function commitArrivalTimeInput() {
                             v-model="form.note"
                             label="Note"
                             placeholder="Any additional notes…"
-                            :disabled="!lookupComplete"
                             :error-messages="submitForm.errors.note"
                             rows="3"
                             auto-grow
@@ -740,7 +899,6 @@ function commitArrivalTimeInput() {
                         <v-checkbox
                             v-model="form.auto_update"
                             label="Automatically update flight details within 24 hours of flight departure"
-                            :disabled="!lookupComplete"
                             hide-details
                             density="compact"
                         />
@@ -749,15 +907,27 @@ function commitArrivalTimeInput() {
 
                 <!-- ── Submit ─────────────────────────────────────────────── -->
                 <v-row>
-                    <v-col cols="12">
+                    <v-col v-if="!isEdit" cols="12" md="6">
                         <v-btn
                             block
                             size="large"
-                            :loading="submitForm.processing"
+                            variant="outlined"
-                            :disabled="!lookupComplete || submitForm.processing"
+                            :loading="submitForm.processing && submitForm.add_more"
-                            @click="submit"
+                            :disabled="submitForm.processing"
+                            @click="submit(true)"
                         >
-                            {{ isEdit ? 'Save Changes' : 'Add Flight' }}
+                            Save Flight and Add Another
+                        </v-btn>
+                    </v-col>
+                    <v-col cols="12" :md="isEdit ? 12 : 6">
+                        <v-btn
+                            block
+                            size="large"
+                            :loading="submitForm.processing && !submitForm.add_more"
+                            :disabled="submitForm.processing"
+                            @click="submit(false)"
+                        >
+                            {{ isEdit ? 'Save Changes' : 'Save Flight' }}
                         </v-btn>
                     </v-col>
                 </v-row>
@@ -768,8 +938,129 @@ function commitArrivalTimeInput() {
 </template>
 
 <style scoped>
-:deep(input[type="date"]::-webkit-calendar-picker-indicator) {
+/* Hand-rolled field chrome for the native <input type="date"> fields.
+   These deliberately bypass v-text-field (see the "Native date inputs"
+   comment in the script block for why), so we approximate the surrounding
+   Vuetify outlined-field look here instead of getting it for free. */
+.native-date-field {
+    position: relative;
+    display: flex;
+    align-items: center;
+    gap: 10px;
+    min-height: 56px;
+    padding: 8px 12px;
+    border: 1px none rgba(255, 255, 255, 0.24);
+    border-bottom-style: solid;
+    background: transparent;
+    transition: border-color 0.15s ease;
+}
+
+.native-date-field:focus-within {
+    border-color: rgb(var(--surface));
+    border-width: 2px;
+    padding: 7px 11px;
+}
+
+.native-date-field__icon {
+    opacity: 0.7;
+    flex-shrink: 0;
+}
+
+.native-date-field__label {
+    position: absolute;
+    top: -8px;
+    left: 38px;
+    padding: 0 4px;
+    font-size: 12px;
+    line-height: 1;
+    color: rgba(255, 255, 255, 0.6);
+    pointer-events: none;
+}
+
+.native-date-field__input {
+    flex: 1;
+    min-width: 0;
+    background: transparent;
+    border: none;
+    outline: none;
+    color: inherit;
+    font-size: 16px;
+    color-scheme: dark;
+}
+
+.native-date-field__input::-webkit-calendar-picker-indicator {
     display: none;
     -webkit-appearance: none;
 }
+
+/* Firefox doesn't support ::-webkit-calendar-picker-indicator; this trims
+   its built-in indicator/spinner button area instead. */
+.native-date-field__input::-moz-calendar-picker-indicator {
+    display: none;
+}
+
+.native-date-field__error {
+    margin-top: 4px;
+    padding-left: 12px;
+    font-size: 12px;
+}
+
+/* Arrival day-offset control */
+.arrival-offset__label {
+    display: block;
+    font-size: 12px;
+    line-height: 1;
+    color: rgba(255, 255, 255, 0.6);
+    margin-bottom: 6px;
+    padding-left: 2px;
+}
+
+.arrival-offset__toggle {
+    display: grid;
+    grid-template-columns: repeat(4, 1fr);
+    width: 100%;
+    height: 48px;
+    border-radius: 4px;
+}
+
+.arrival-offset__btn {
+    min-width: 0;
+    flex: none;
+    width: 100%;
+    height: 100%;
+    font-size: 11px;
+    letter-spacing: 0;
+    text-transform: none;
+    padding: 0 4px;
+}
+
+.arrival-offset__footer {
+    display: flex;
+    align-items: baseline;
+    justify-content: space-between;
+    gap: 8px;
+    margin-top: 6px;
+    padding: 0 2px;
+}
+
+.arrival-offset__hint {
+    font-size: 13px;
+    color: rgba(255, 255, 255, 0.7);
+}
+
+.arrival-offset__link {
+    flex-shrink: 0;
+    font-size: 12px;
+    color: rgba(255, 255, 255, 0.75);
+    background: none;
+    border: none;
+    padding: 0;
+    cursor: pointer;
+    text-decoration: underline;
+    text-underline-offset: 2px;
+}
+
+.arrival-offset__link:hover {
+    color: rgb(255, 255, 255);
+}
 </style>

resources/js/Pages/Admin/AdminSidebar.vue

@@ -19,7 +19,7 @@ defineProps<{
             Reconcile Missing Liveries
             <v-chip  size="x-small" color="error" class="ml-1">{{ missingLiveryCount }}</v-chip>
         </Link>
-        <Link :href="route('admin.reconcile-missing-airlines')" class="sidebar-link">
+        <Link v-if="missingAirlineCount" :href="route('admin.reconcile-missing-airlines')" class="sidebar-link">
             <v-icon icon="mdi-airplane-takeoff" size="18" />
             Reconcile Missing Airlines
             <v-chip  size="x-small" color="error" class="ml-1">{{ missingAirlineCount }}</v-chip>

resources/js/Pages/Feed.vue

@@ -9,6 +9,7 @@ import PlaneLoader from "@/Components/FlightsGoneBy/PlaneLoader.vue";
 import { useFlights } from "@/Composables/useFlights";
 import { useApiResource } from "@/Composables/useApiResource";
 import Avatar from "@/Components/FlightsGoneBy/Feed/Avatar.vue";
+import UserSearchBox from "@/Components/UserSearchBox.vue";
 
 defineOptions({ layout: MainLayout })
 
@@ -46,8 +47,9 @@ const { data: following, loading: followingLoading } = useApiResource<User[]>('/
                 </div>
             </section>
 
+            <UserSearchBox />
+
             <div class="feed-grid">
-                <!-- FOLLOWING: secondary, supporting content -->
                 <aside class="following-box">
                     <h2>Following</h2>
                     <div v-if="followingLoading" class="following-loading">

resources/js/Pages/Profile/Achievements/airlines_alliances.all_major_alliances.vue

@@ -0,0 +1,146 @@
+<script setup lang="ts">
+import { computed } from 'vue'
+import { Achievement, Alliance, Flight, User } from '@/Types/types'
+import Panel from '@/Components/FlightsGoneBy/Panels/Panel.vue'
+import PanelHeader from '@/Components/FlightsGoneBy/Panels/PanelHeader.vue'
+import PanelSubHeader from '@/Components/FlightsGoneBy/Panels/PanelSubHeader.vue'
+import BadgeTable from '@/Components/FlightsGoneBy/GenericBadgeTable.vue'
+import AllianceLogo from '@/Components/FlightsGoneBy/AllianceLogo.vue'
+import FlightBadge from '@/Components/FlightsGoneBy/FlightBadge.vue'
+
+defineOptions({ inheritAttrs: false })
+
+const props = defineProps<{
+    achievement: Achievement
+    user: User
+    followStatus: string
+    majorAlliances: Alliance[]
+    flights: Flight[]
+}>()
+
+interface AllianceEntry {
+    alliance: Alliance
+    flights: Flight[]
+}
+
+const alliances = computed<AllianceEntry[]>(() => {
+    const entries = props.majorAlliances.map(alliance => ({ alliance, flights: [] as Flight[] }))
+    const byName = new Map(entries.map(e => [e.alliance.internal_name, e]))
+
+    for (const flight of props.flights) {
+        const key = flight.airline?.alliance?.internal_name
+        if (!key) continue
+        byName.get(key)?.flights.push(flight)
+    }
+
+    return entries
+})
+
+const rows = computed(() => alliances.value.map(e => e.alliance.internal_name))
+
+function entryFor(key: string): AllianceEntry {
+    return alliances.value.find(e => e.alliance.internal_name === key)!
+}
+
+const completedCount = computed(
+    () => alliances.value.filter(a => a.flights.length > 0).length
+)
+
+function flightTitle(flight: Flight): string {
+    const name = flight.airline?.name ?? 'Unknown airline'
+    return `${name}: ${flight.departure_airport?.iata_code} → ${flight.arrival_airport?.iata_code}`
+}
+</script>
+
+<template>
+    <!-- Header -->
+    <Panel>
+        <div class="alliance-header">
+            <div class="logo-row">
+                <AllianceLogo
+                    v-for="entry in alliances"
+                    :key="entry.alliance.internal_name"
+                    :alliance="entry.alliance"
+                    size="56"
+                />
+            </div>
+
+        </div>
+    </Panel>
+
+    <!-- Alliances table -->
+    <Panel>
+        <div class="table-toolbar">
+            <PanelHeader>Alliances</PanelHeader>
+        </div>
+
+        <BadgeTable
+            :rows="rows"
+            :rowKey="key => key"
+            :hasItems="key => entryFor(key).flights.length > 0"
+            labelWidth="14em"
+        >
+            <template #label="{ row: key }">
+                <div class="airline-label">
+                    <AllianceLogo :alliance="entryFor(key).alliance" size="24" />
+                    <span>{{ entryFor(key).alliance.name }}</span>
+                </div>
+            </template>
+
+            <template #items="{ row: key }">
+                <FlightBadge
+                    v-for="flight in entryFor(key).flights"
+                    :key="flight.id"
+                    :title="flightTitle(flight)"
+                    :flight="flight"
+                />
+            </template>
+        </BadgeTable>
+    </Panel>
+
+    <!-- Requirements -->
+    <Panel>
+        <PanelHeader centered>Requirements</PanelHeader>
+        <p>
+            To complete this challenge you must fly with at least one member airline from each of
+            the three major alliances. Unlike the individual alliance challenges, you don't need
+            to fly every airline in an alliance — just one flight per alliance is enough.
+        </p>
+
+        <p>
+            Codeshare flights do not count, the operating carrier must be a member of the
+            alliance.
+        </p>
+    </Panel>
+</template>
+
+<style scoped>
+.alliance-header {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 1.5rem;
+    flex-wrap: wrap;
+}
+
+.logo-row {
+    display: flex;
+    gap: 0.75rem;
+}
+
+.table-toolbar {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: 1rem;
+    margin-bottom: 0.75rem;
+}
+
+.airline-label {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    gap: 0.5rem;
+    padding: 0 0.25rem;
+}
+</style>

resources/js/Pages/Profile/Achievements/countries_continents.all_continent_pairs_both_ways.vue

@@ -21,6 +21,12 @@ const continents = computed(() => props.continents.filter(c => c.internal_name !
 
 const { entriesByDeparture, departureNames, completedCount, totalCount } =
     useDirectedContinentPairs(flights, continents)
+
+// Split "Africa → Asia" into ["Africa", "Asia"] for independent flex items
+function splitLabel(label: string): [string, string] {
+    const [from, to] = label.split('→').map(part => part.trim())
+    return [from, to]
+}
 </script>
 
 <template>
@@ -35,11 +41,16 @@ const { entriesByDeparture, departureNames, completedCount, totalCount } =
             :rows="entriesByDeparture.get(dep) ?? []"
             :rowKey="entry => entry.key"
             :hasItems="entry => entry.flights.length > 0"
-            labelWidth="18em"
+            compactOnMobile
         >
             <template #label="{ row: entry }">
                 <div class="pair-label">
-                    <span class="pair-name">{{ entry.label }}</span>
+                    <span class="pair-part">{{ splitLabel(entry.label)[0] }}</span>
+                    <span class="pair-divider">
+                        <span class="divider-horizontal">{{ '\u2192\uFE0E' }}</span>
+                        <span class="divider-vertical">{{ '\u2193\uFE0E' }}</span>
+                    </span>
+                    <span class="pair-part">{{ splitLabel(entry.label)[1] }}</span>
                 </div>
             </template>
 
@@ -80,4 +91,55 @@ const { entriesByDeparture, departureNames, completedCount, totalCount } =
     gap: 1rem;
     margin-bottom: 0.75rem;
 }
+
+.pair-label {
+    width: 100%;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center;
+    gap: 0.35rem;
+    padding: 0 0.25rem;
+}
+
+.pair-part {
+    font-size: 0.9rem;
+    text-align: center;
+    white-space: nowrap;
+}
+
+.pair-divider {
+    font-size: 0.9rem;
+    opacity: 0.6;
+    flex-shrink: 0;
+}
+
+.divider-vertical {
+    display: none;
+}
+
+@container (max-width: 480px) {
+    .pair-label {
+        flex-direction: column;
+        gap: 0.1rem;
+    }
+
+    .pair-part {
+        font-size: 0.7rem;
+        white-space: normal;
+    }
+
+    .pair-divider {
+        font-size: 0.65rem;
+        line-height: 1;
+    }
+
+    .divider-horizontal {
+        display: none;
+    }
+
+    .divider-vertical {
+        display: inline;
+    }
+}
 </style>

resources/js/Pages/Profile/Achievements/countries_continents.all_continent_pairs_one_way.vue

@@ -19,6 +19,12 @@ const flights = computed(() => props.flights)
 const continents = computed(() => props.continents.filter(c => c.internal_name !== 'antarctica'))
 
 const { entries, completedCount, totalCount } = useUndirectedContinentPairs(flights, continents)
+
+// Split "Africa↔Asia" into ["Africa", "Asia"] for independent flex items
+function splitLabel(label: string): [string, string] {
+    const [from, to] = label.split('↔')
+    return [from, to]
+}
 </script>
 
 <template>
@@ -32,11 +38,16 @@ const { entries, completedCount, totalCount } = useUndirectedContinentPairs(flig
             :rows="entries"
             :rowKey="entry => entry.key"
             :hasItems="entry => entry.flights.length > 0"
-            labelWidth="18em"
+            compactOnMobile
         >
             <template #label="{ row: entry }">
                 <div class="pair-label">
-                    <span class="pair-name">{{ entry.label }}</span>
+                    <span class="pair-part">{{ splitLabel(entry.label)[0] }}</span>
+                    <span class="pair-divider">
+                        <span class="divider-horizontal">{{ '\u2194\uFE0E' }}</span>
+                        <span class="divider-vertical">{{ '\u2195\uFE0E' }}</span>
+                    </span>
+                    <span class="pair-part">{{ splitLabel(entry.label)[1] }}</span>
                 </div>
             </template>
 
@@ -80,12 +91,51 @@ const { entries, completedCount, totalCount } = useUndirectedContinentPairs(flig
 .pair-label {
     width: 100%;
     display: flex;
+    flex-direction: row;
     align-items: center;
-    gap: 0.5rem;
+    justify-content: center;
+    gap: 0.35rem;
     padding: 0 0.25rem;
 }
 
-.pair-name {
+.pair-part {
     font-size: 0.9rem;
+    text-align: center;
+    white-space: nowrap;
+}
+
+.pair-divider {
+    font-size: 0.9rem;
+    opacity: 0.6;
+    flex-shrink: 0;
+}
+
+.divider-vertical {
+    display: none;
+}
+
+@container (max-width: 480px) {
+    .pair-label {
+        flex-direction: column;
+        gap: 0.1rem;
+    }
+
+    .pair-part {
+        font-size: 0.7rem;
+        white-space: normal;
+    }
+
+    .pair-divider {
+        font-size: 0.65rem;
+        line-height: 1;
+    }
+
+    .divider-horizontal {
+        display: none;
+    }
+
+    .divider-vertical {
+        display: inline;
+    }
 }
 </style>

resources/js/Pages/Profile/Achievements/fun_challenges.all_london_airports.vue

@@ -0,0 +1,139 @@
+<script setup lang="ts">
+import { computed } from 'vue'
+import { Achievement, Flight, User, Airport } from '@/Types/types'
+import Panel from '@/Components/FlightsGoneBy/Panels/Panel.vue'
+import PanelHeader from '@/Components/FlightsGoneBy/Panels/PanelHeader.vue'
+import BadgeTable from '@/Components/FlightsGoneBy/GenericBadgeTable.vue'
+import FlightBadge from '@/Components/FlightsGoneBy/FlightBadge.vue'
+
+defineOptions({ inheritAttrs: false })
+
+
+const props = defineProps<{
+    achievement: Achievement
+    user: User
+    followStatus: string
+    londonAirports: string[]
+    flights: Flight[]
+}>()
+
+interface AirportEntry {
+    code: string
+    airport: Airport | null
+    flights: Flight[]
+}
+
+const LONDON_AIRPORT_NAMES: Record<string, string> = {
+    LHR: 'Heathrow Airport',
+    LGW: 'Gatwick Airport',
+    STN: 'Stansted Airport',
+    LTN: 'Luton Airport',
+    LCY: 'City Airport',
+    SEN: 'Southend Airport',
+}
+
+
+const airports = computed<AirportEntry[]>(() => {
+    const entries = props.londonAirports.map(code => ({
+        code,
+        airport: null as Airport | null,
+        flights: [] as Flight[],
+    }))
+    const byCode = new Map(entries.map(e => [e.code, e]))
+
+    for (const flight of props.flights) {
+        const dep = flight.departure_airport
+        const arr = flight.arrival_airport
+
+        if (dep?.iata_code && byCode.has(dep.iata_code)) {
+            const entry = byCode.get(dep.iata_code)!
+            entry.airport ??= dep
+            entry.flights.push(flight)
+        }
+
+        if (arr?.iata_code && byCode.has(arr.iata_code)) {
+            const entry = byCode.get(arr.iata_code)!
+            entry.airport ??= arr
+            entry.flights.push(flight)
+        }
+    }
+
+    return entries
+})
+
+const rows = computed(() => airports.value.map(e => e.code))
+
+function entryFor(code: string): AirportEntry {
+    return airports.value.find(e => e.code === code)!
+}
+
+function flightTitle(flight: Flight): string {
+    const name = flight.airline?.name ?? 'Unknown airline'
+    return `${name}: ${flight.departure_airport?.iata_code} → ${flight.arrival_airport?.iata_code}`
+}
+</script>
+
+<template>
+    <!-- Airports table -->
+    <Panel>
+        <div class="table-toolbar">
+            <PanelHeader>London Airports</PanelHeader>
+        </div>
+
+        <BadgeTable
+            :rows="rows"
+            :rowKey="code => code"
+            :hasItems="code => entryFor(code).flights.length > 0"
+            labelWidth="14em"
+        >
+            <template #label="{ row: code }">
+                <div class="airport-label">
+                    <span class="airport-code">{{ code }}</span>
+                    <span>{{ LONDON_AIRPORT_NAMES[code] ?? code }}</span>
+                </div>
+            </template>
+
+            <template #items="{ row: code }">
+                <FlightBadge
+                    v-for="flight in entryFor(code).flights"
+                    :key="flight.id"
+                    :title="flightTitle(flight)"
+                    :flight="flight"
+                />
+            </template>
+        </BadgeTable>
+    </Panel>
+
+    <!-- Requirements -->
+    <Panel>
+        <PanelHeader centered>Requirements</PanelHeader>
+        <p>
+            To complete this challenge you must fly to all {{ londonAirports.length }} of
+            London's airports — Heathrow, Gatwick, Stansted, Luton, London City, and Southend.
+        </p>
+    </Panel>
+</template>
+
+<style scoped>
+.table-toolbar {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: 1rem;
+    margin-bottom: 0.75rem;
+}
+
+.airport-label {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    gap: 0.5rem;
+    padding: 0 0.25rem;
+}
+
+.airport-code {
+    font-weight: 600;
+    opacity: 0.7;
+    min-width: 2.75rem;
+}
+</style>

resources/js/Pages/Profile/UserAchievement.vue

@@ -12,6 +12,7 @@ import {useFlights} from "@/Composables/useFlights";
 import InlineBadge from "@/Components/FlightsGoneBy/InlineBadge.vue";
 import GlassTooltip from "@/Components/FlightsGoneBy/GlassTooltip.vue";
 import ButtonLink from "@/Components/FlightsGoneBy/ButtonLink.vue";
+import FollowingSelectBox from "@/Components/FlightsGoneBy/FollowingSelectBox.vue";
 
 defineOptions({ layout: MainLayout })
 
@@ -24,8 +25,10 @@ const props = defineProps<{
     regions: Region[]
     alliance: Alliance | null
     airlines: Airline[]
+    london_airports: string[]
     continents: Continent[]
     aircraft_families: Record<string, string[]>
+    majorAlliances: Alliance[]
     achievementCount: number
     canView: boolean
 }>()
@@ -63,7 +66,7 @@ const unlocked = computed(() => {
 
             <VAlert type="info" v-if="loggedInUser?.id !== user.id && loggedInUser">
                 You are viewing {{user.name}}'s progress in this achievement. If you would like to see your progress, please
-                <Link :href="route('profile.achievement', {user: loggedInUser.name, achievement: achievement.internal_name})"><VBtn variant="flat">click here.</VBtn></Link>
+                <Link :href="route('profile.achievement', {user: loggedInUser.name, achievement: achievement.internal_name})"><u>click here.</u></Link>
             </VAlert>
 
 
@@ -116,6 +119,14 @@ const unlocked = computed(() => {
                 :alliance="alliance"
                 :continents="continents"
                 :families="aircraft_families"
+                :major-alliances="majorAlliances"
+                :london-airports="london_airports"
+            />
+
+            <FollowingSelectBox
+                redirect-route="profile.achievement"
+                :route-params="{ achievement: achievement.internal_name }"
+                placeholder="View the Progress of Someone You Follow"
             />
         </div>
     </ProfileLayout>

resources/js/Pages/UserAchievements.vue

@@ -9,6 +9,7 @@ import MainLayout from "@/Layouts/MainLayout.vue";
 import Panel from "@/Components/FlightsGoneBy/Panels/Panel.vue";
 import PanelHeader from "@/Components/FlightsGoneBy/Panels/PanelHeader.vue";
 import {useUpdateSetting} from "@/Composables/useUpdateSetting";
+import FollowingSelectBox from "@/Components/FlightsGoneBy/FollowingSelectBox.vue";
 
 const {updateSetting} = useUpdateSetting()
 
@@ -121,6 +122,8 @@ const filteredUnlockedCount = computed(() =>
                     />
                 </div>
             </Panel>
+
+            <FollowingSelectBox redirect-route="profile.achievements" placeholder="View The Achievements of Someone You Follow" />
         </div>
     </ProfileLayout>
 </template>

resources/js/Pages/UserProfile.vue

@@ -56,6 +56,8 @@ const selectedFlightReasons  = ref<number[]>([])
 const selectedSeatTypes      = ref<number[]>([])
 const selectedManufacturers  = ref<string[]>([])
 const selectedAircraftModels = ref<number[]>([])
+const selectedEngineTypes    = ref<string[]>([])
+const selectedEngineCounts   = ref<number[]>([])
 const selectedAirportRegions = ref<number[]>([])
 const selectedOtherUsers = ref<string[]>([])
 
@@ -74,6 +76,8 @@ const activeFilterCount = computed(() =>
     selectedSeatTypes.value.length +
     selectedManufacturers.value.length +
     selectedAircraftModels.value.length +
+    selectedEngineTypes.value.length +
+    selectedEngineCounts.value.length +
     selectedAirportRegions.value.length +
     selectedOtherUsers.value.length
 )
@@ -93,6 +97,8 @@ function onFiltersChange(filters: {
     seatTypes: number[]
     manufacturers: string[]
     aircraftModels: number[]
+    engineTypes: string[]
+    engineCounts: number[]
     airportRegions: number[]
     otherUsers: string[]
 }) {
@@ -111,6 +117,8 @@ function onFiltersChange(filters: {
     selectedSeatTypes.value      = filters.seatTypes
     selectedManufacturers.value  = filters.manufacturers
     selectedAircraftModels.value = filters.aircraftModels
+    selectedEngineTypes.value    = filters.engineTypes
+    selectedEngineCounts.value   = filters.engineCounts
     selectedAirportRegions.value = filters.airportRegions
     selectedOtherUsers.value     = filters.otherUsers
 }
@@ -141,6 +149,8 @@ function matchesFilters(f: Flight): boolean {
     if (selectedSeatTypes.value.length && !selectedSeatTypes.value.includes(f.seat_type?.id ?? -1)) return false
     if (selectedManufacturers.value.length && !selectedManufacturers.value.includes(f.aircraft?.manufacturer_code ?? '')) return false
     if (selectedAircraftModels.value.length && !selectedAircraftModels.value.includes(f.aircraft?.id ?? -1)) return false
+    if (selectedEngineTypes.value.length && !selectedEngineTypes.value.includes(f.aircraft?.engine_type ?? '')) return false
+    if (selectedEngineCounts.value.length && !selectedEngineCounts.value.includes(f.aircraft?.engine_count ?? -1)) return false
     if (selectedAirportRegions.value.length) {
         const depRegion = f.departure_airport.region?.id
         const arrRegion = f.arrival_airport.region?.id

resources/js/Types/types.d.ts

@@ -101,6 +101,7 @@ export type SharedProps = import('@inertiajs/core').PageProps & {
         roles: string[];
         permissions: string[];
         apiToken: string | null;
+        following: string[];
     },
     flash: {
         success?: string;
@@ -333,6 +334,7 @@ export interface MissingAirline{
     flights: {
         flight_number: string;
         link: string;
+        id: number;
     }[]
 }
 

routes/web.php

@@ -42,6 +42,8 @@ use Inertia\Inertia;
         Route::post('/ignore-missing-livery', [AdminController::class, 'ignoreMissingLivery'])->name('ignore-missing-livery');
 
         Route::get('/missing-airlines', [AdminController::class, 'reconcileMissingAirlines'])->name('reconcile-missing-airlines')->middleware('permission:reconcile_missing_liveries');
+        Route::post('/ignore-missing-airline', [AdminController::class, 'ignoreMissingAirline'])->name('admin.ignore-missing-airline');
+
     });
 
 
@@ -103,10 +105,11 @@ Route::middleware(['auth'])->group(function () {
 
 
 
-//Search Routes
+    //Search Routes
     Route::get('/search/airlines', [SearchController::class, 'airlines'])->name('search.airlines');
     Route::get('/search/aircraft', [SearchController::class, 'aircraft'])->name('search.aircraft');
     Route::get('/search/airports', [SearchController::class, 'airports'])->name('search.airports');
+    Route::get('/search/users', [SearchController::class, 'users'])->name('search.users');
 
     Route::get('/u/{user}', [UserProfileController::class, 'view'])->name('profile.view');
     Route::get('/u/{user}/map', [UserProfileController::class, 'map'])->name('profile.map');